Merge pull request #1003 from DonLakeFlyer/FixFileLocations

New File Locations key not set in QSettings at boot

Merge pull request #1003 from DonLakeFlyer/FixFileLocations
New File Locations key not set in QSettings at boot
88a73680 · Don Gagne · 58e75ae8 · a7e6cc57 · 88a73680
Commit 88a73680 authored Nov 25, 2014 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

QGCCore.cc src/QGCCore.cc +5 -3

No files found.
--- a/src/QGCCore.cc
+++ b/src/QGCCore.cc
@@ -155,9 +155,11 @@ bool QGCApplication::init(void)
        QDir documentsDir(documentsLocation);
        Q_ASSERT(documentsDir.exists());
        
-        if (documentsDir.mkpath(_defaultSavedFileDirectoryName)) {
-            savedFilesLocation = documentsDir.filePath(_defaultSavedFileDirectoryName);
-        }
+        bool pathCreated = documentsDir.mkpath(_defaultSavedFileDirectoryName);
+        Q_UNUSED(pathCreated);
+        Q_ASSERT(pathCreated);
+        savedFilesLocation = documentsDir.filePath(_defaultSavedFileDirectoryName);
+        settings.setValue(_savedFilesLocationKey, savedFilesLocation);
    }
    
    if (!savedFilesLocation.isEmpty()) {