[vlc-devel] commit: Don't assert for NULL instance in killInstance ( Hugo Beauzee-Luyssen )

git version control git at videolan.org
Tue Feb 16 14:22:31 CET 2010


vlc | branch: master | Hugo Beauzee-Luyssen <beauze.h at gmail.com> | Tue Feb 16 02:09:21 2010 +0100| [1c07e9e44edaf359003339727b02fe8220e37ac3] | committer: Jean-Baptiste Kempf 

Don't assert for NULL instance in killInstance

Singleton pattern is about not carring about this.
Fixing failing assert when quitting VLC after the view menu has been
clicked

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1c07e9e44edaf359003339727b02fe8220e37ac3
---

 modules/gui/qt4/dialogs/extensions.hpp |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/dialogs/extensions.hpp b/modules/gui/qt4/dialogs/extensions.hpp
index d71a5a0..dafb12e 100644
--- a/modules/gui/qt4/dialogs/extensions.hpp
+++ b/modules/gui/qt4/dialogs/extensions.hpp
@@ -75,7 +75,6 @@ public:
     }
     static void killInstance()
     {
-        assert( instance != NULL );
         delete instance;
         instance = NULL;
     }




More information about the vlc-devel mailing list