Changeset 4168 in ntrip for trunk/BNC/bncapp.cpp

Timestamp:

May 14, 2012, 2:14:55 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncapp.cpp (modified) (2 diffs)

trunk/BNC/bncapp.cpp

@@ -712 +712 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncApp::setConfFileName(const QString& confFileName) {
-  if (confFileName.isEmpty()) {
-    _confFileName = QDir::homePath() + QDir::separator() 
-                  + ".config" + QDir::separator()
-                  + organizationName() + QDir::separator()
-                  + applicationName() + ".ini";
-  }
-  else {
-    _confFileName = confFileName;
+  if (_confFileName.isEmpty()) { // do it only once
+    if (confFileName.isEmpty()) {
+      _confFileName = QDir::homePath() + QDir::separator() 
+                    + ".config" + QDir::separator()
+                    + organizationName() + QDir::separator()
+                    + applicationName() + ".ini";
+    }
+    else {
+      _confFileName = confFileName;
+    }
   }
 }
@@ -796 +798 @@
   if (ev->type() == QEvent::FileOpen) {
     QString fileName = static_cast<QFileOpenEvent*>(ev)->file();
+    setConfFileName(fileName);
     return true;
   }