diff options
| author | Arno <arno@disconnect.de> | 2017-07-20 06:58:50 +0200 |
|---|---|---|
| committer | Arno <arno@disconnect.de> | 2017-07-20 06:58:50 +0200 |
| commit | 4ebd741d2bd6061dd4812adf0a89bd0cdb81023d (patch) | |
| tree | 3e39abb2b5b28c15bf34941e741c43bcda2e8ebb /smglobals.cpp | |
| parent | 7c6deee2325d83f711fd28767467865da7cda848 (diff) | |
| download | SheMov-4ebd741d2bd6061dd4812adf0a89bd0cdb81023d.tar.gz SheMov-4ebd741d2bd6061dd4812adf0a89bd0cdb81023d.tar.bz2 SheMov-4ebd741d2bd6061dd4812adf0a89bd0cdb81023d.zip | |
Fix one crash and compile issues
Don't access FileName in constructWindowTitle when we don't have a file
at mCurPos. That's what crashed us randomly!
Also (yes, I know, should be a separate commit) fix warnings about
implicit fallthru's in switch statements. The one in SmDirModel actually
was a bug, the one in tabChanged is just a nuisance.
Also (again), shuffle header inclusion in SmGlobals so Xlib and QT don't
clash.
Diffstat (limited to 'smglobals.cpp')
| -rw-r--r-- | smglobals.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/smglobals.cpp b/smglobals.cpp index 23047d1..aff8e1b 100644 --- a/smglobals.cpp +++ b/smglobals.cpp @@ -17,9 +17,6 @@ #include <QTemporaryFile> #include <QProcess> -#include <X11/Xlib.h> -#include <X11/extensions/Xfixes.h> - #include "smglobals.h" #include "archivemodel.h" #include "mappingtablemodel.h" @@ -30,6 +27,10 @@ #include "archivecontroller.h" #include "archivebrowsermodel.h" +#include <X11/Xlib.h> +#include <X11/extensions/Xfixes.h> + + SmGlobals *SmGlobals::mInstance = 0; SmGlobals::~SmGlobals(){ |