summaryrefslogtreecommitdiffstats
path: root/qt-gui.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-04-22 06:45:57 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-04-22 06:45:57 -0700
commit5da11cbc6a1d3339cbb519cf74e4377b8cbaee5f (patch)
tree5263b28d0c9be3a58e5e081328d66f70080712b1 /qt-gui.cpp
parent26076610e54957bedd9f04d68000c03009c20373 (diff)
downloadsubsurface-5da11cbc6a1d3339cbb519cf74e4377b8cbaee5f.tar.gz
Fix crash with some setups
Initialize Qt earlier, before Gtk gets its hands on argc / argv. Suggested-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-gui.cpp')
-rw-r--r--qt-gui.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-gui.cpp b/qt-gui.cpp
index 86731bb36..5da140765 100644
--- a/qt-gui.cpp
+++ b/qt-gui.cpp
@@ -1866,7 +1866,6 @@ QStringList MainWindow::fileNameFilters() const
void init_qt_ui(int *argcp, char ***argvp)
{
- application = new QApplication(*argcp, *argvp);
application->installTranslator(new Translator(application));
MainWindow *window = new MainWindow();
window->show();
@@ -1874,6 +1873,7 @@ void init_qt_ui(int *argcp, char ***argvp)
void init_ui(int *argcp, char ***argvp)
{
+ application = new QApplication(*argcp, *argvp);
GtkWidget *win;
GtkWidget *nb_page;
GtkWidget *dive_list;