Add GPL boilerplate; fix dangling instance pointer after
Splash is deleted. git-svn-id: svn://localhost/ardour2/branches/3.0@12532 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
66af96b7cf
commit
183d09d4af
|
@ -1,3 +1,22 @@
|
|||
/*
|
||||
Copyright (C) 2008 Paul Davis
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "pbd/failed_constructor.h"
|
||||
|
@ -20,6 +39,8 @@ Splash* Splash::the_splash = 0;
|
|||
|
||||
Splash::Splash ()
|
||||
{
|
||||
assert (the_splash = 0);
|
||||
|
||||
sys::path splash_file;
|
||||
|
||||
if (!find_file_in_search_path (ardour_data_search_path(), "splash.png", splash_file)) {
|
||||
|
@ -59,6 +80,11 @@ Splash::Splash ()
|
|||
ARDOUR::BootMessage.connect (msg_connection, invalidator (*this), boost::bind (&Splash::boot_message, this, _1), gui_context());
|
||||
}
|
||||
|
||||
Splash::~Splash ()
|
||||
{
|
||||
the_splash = 0;
|
||||
}
|
||||
|
||||
void
|
||||
Splash::pop_back_for (Gtk::Window& win)
|
||||
{
|
||||
|
|
|
@ -34,7 +34,7 @@ class Splash : public Gtk::Window
|
|||
{
|
||||
public:
|
||||
Splash ();
|
||||
~Splash () {}
|
||||
~Splash ();
|
||||
|
||||
static Splash* instance() { return the_splash; }
|
||||
|
||||
|
|
Loading…
Reference in New Issue