From: Shamus Hammons <jlhamm@acm.org>
Date: Fri, 14 Sep 2012 16:06:11 +0000 (-0500)
Subject: Fixed problem with crashing on 64-bit Linux & possibly others.
X-Git-Tag: 2.1.0~16
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=virtualjaguar;a=commitdiff_plain;h=d59de2a3408a34b53772bfd4b00cd3e8dc50a03b

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 220275a..cbe6051 100644
--- 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 85462ff..664ce67 100644
--- 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;