From 60ca4ecdd680555bd4cf3a3ff91701b4c537d80a Mon Sep 17 00:00:00 2001
From: Marco Biasini <marco.biasini@unibas.ch>
Date: Mon, 18 Mar 2013 14:05:16 +0100
Subject: [PATCH] fix segfault when launching DNG on Mountain Lion
---
modules/gui/src/gosty.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/gui/src/gosty.cc b/modules/gui/src/gosty.cc
index ad13d07b3..858c55a03 100644
--- a/modules/gui/src/gosty.cc
+++ b/modules/gui/src/gosty.cc
@@ -208,7 +208,7 @@ void prepare_scripts(int argc, char** argv, PythonInterpreter& py)
class MyApplication : public QApplication
{
public:
- MyApplication(int argc, char** argv) : QApplication(argc, argv) {}
+ MyApplication(int& argc, char** argv) : QApplication(argc, argv) {}
virtual ~MyApplication() {}
virtual bool notify(QObject *rec, QEvent *ev)
{
@@ -232,11 +232,13 @@ public:
int main(int argc, char** argv)
{
int dummy_argc=1;
-
- MyApplication app(dummy_argc,argv);
+ char *dummy_argv[]= {argv[0], NULL };
+ std::cout << dummy_argv[0] << std::endl;
+ MyApplication app(dummy_argc, dummy_argv);
QCoreApplication::setOrganizationName("OpenStructure");
QCoreApplication::setOrganizationDomain("openstructure.org");
QCoreApplication::setApplicationName(QString(argv[2]));
+
if (int rv=setup_resources(app)<0) {
return rv;
}
--
GitLab