Changeset 4169 in ntrip

Timestamp:

May 14, 2012, 2:17:28 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()) { // do it only once
-    if (confFileName.isEmpty()) {
-      _confFileName = QDir::homePath() + QDir::separator() 
-                    + ".config" + QDir::separator()
-                    + organizationName() + QDir::separator()
-                    + applicationName() + ".ini";
-    }
-    else {
-      _confFileName = confFileName;
-    }
+  if (confFileName.isEmpty()) {
+    _confFileName = QDir::homePath() + QDir::separator() 
+                  + ".config" + QDir::separator()
+                  + organizationName() + QDir::separator()
+                  + applicationName() + ".ini";
+  }
+  else {
+    _confFileName = confFileName;
   }
 }
@@ -796 +794 @@
 bool bncApp::event(QEvent* ev) {
 
-  if (ev->type() == QEvent::FileOpen) {
+  if (ev->type() == QEvent::FileOpen) {  // currently happens on Mac only
     QString fileName = static_cast<QFileOpenEvent*>(ev)->file();
     setConfFileName(fileName);