From 4ebd741d2bd6061dd4812adf0a89bd0cdb81023d Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Thu, 20 Jul 2017 06:58:50 +0200
Subject: 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.
---
 smglobals.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'smglobals.cpp')

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(){
-- 
cgit v1.2.3-70-g09d2