From 205749956e0a4ed4a839315eede741b37616118b Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Sat, 27 Apr 2019 09:02:04 -0400
Subject: Ensure that the browser path is always canonical. Also ensure that
 glib is not used for Qt.

---
 src-qt5/desktop-utils/lumina-fm/Browser.cpp | 4 +++-
 src-qt5/desktop-utils/lumina-fm/main.cpp    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src-qt5/desktop-utils')

diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
index 02f1fc89..26d95faa 100644
--- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
@@ -178,7 +178,9 @@ void Browser::loadDirectory(QString dir, bool force){
   if(dir.isEmpty()){ return; } //nothing to do - nothing previously loaded
   updateList.clear();
   //qDebug() << "Load Directory" << dir;
-  if(dir.endsWith("/")){ dir.chop(1); }
+  //Ensure we have the canonical path for this dir
+  dir = QDir(dir).canonicalPath();
+  //if(dir.endsWith("/")){ dir.chop(1); }
   bool dirupdate = true;
   if(currentDir != dir){ //let the main widget know to clear all current items (completely different dir)
     //qDebug() << " - different Directory";
diff --git a/src-qt5/desktop-utils/lumina-fm/main.cpp b/src-qt5/desktop-utils/lumina-fm/main.cpp
index 3b8fdcd0..c40364ea 100644
--- a/src-qt5/desktop-utils/lumina-fm/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/main.cpp
@@ -14,6 +14,7 @@
 
 int main(int argc, char ** argv)
 {
+    qputenv("QT_NO_GLIB","1");
     LTHEME::LoadCustomEnvSettings();
     qsrand(QDateTime::currentMSecsSinceEpoch());
     LSingleApplication a(argc, argv, "lumina-fm"); //loads translations inside constructor
-- 
cgit