Fixed problem with crashing on 64-bit Linux & possibly others.

Quite frankly we don't know how it was running anywhere else, as Qt made
a subtle change in how their QApplication objects were created without
making it known far and wide. Maybe they did, and I just missed it. But
the lesson learned is that for want of an ampersand, a kingdom was lost.

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index 220275a2cee506c98e0b1ac45afe309f901f0a0e..cbe605125ed4aa9d359f7bc5caaa67dd9b5a2fb3 100644 (file)
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -116,7 +116,7 @@ int main(int argc, char * argv[])
 //
 // Main app constructor--we stick globally accessible stuff here... (?)
 //
-App::App(int argc, char * argv[]): QApplication(argc, argv)
+App::App(int & argc, char * argv[]): QApplication(argc, argv)
 {
        bool loadAndGo = !filename.isEmpty();
 

diff --git a/src/gui/app.h b/src/gui/app.h
index 85462ff40d9d3c76ed406be64501078050b85d24..664ce67a835834ffa5d009c74b4dcc7834f15a9a 100644 (file)
--- a/src/gui/app.h
+++ b/src/gui/app.h
@@ -17,7 +17,7 @@ class MainWin;
 class App: public QApplication
 {
        public:
-               App(int argc, char * argv[]);
+               App(int & argc, char * argv[]);
 
        private:
                MainWin * mainWindow;