[vlc-commits] commit: Qt4: do not explode if MyDocument isn't available ( Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Thu Jul 8 23:58:19 CEST 2010
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul 8 23:53:43 2010 +0200| [a22a81e3364be22b4ada4327f837e5d1713c6011] | committer: Jean-Baptiste Kempf
Qt4: do not explode if MyDocument isn't available
See http://forum.videolan.org/viewtopic.php?f=14&t=78396
(cherry picked from commit fe145872fccb389edc97c3dea2463f4956bc3db4)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=a22a81e3364be22b4ada4327f837e5d1713c6011
---
modules/gui/qt4/qt4.hpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 47407d5..e46dbaf 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -122,7 +122,7 @@ static inline QString QVLCUserDir( vlc_userdir_t type )
{
char *dir = config_GetUserDir( type );
if( !dir )
- abort();
+ return "";
QString res = qfu( dir );
free( dir );
return res;
More information about the vlc-commits
mailing list