From 7d7e01c4e7b79a817e64837b852ce4ffd9ae2855 Mon Sep 17 00:00:00 2001
From: jpbl <jpbl>
Date: Mon, 18 Jul 2005 23:26:21 +0000
Subject: [PATCH] Bug fix if there's an error, before setGUI
---
src/main.cpp | 2 +-
utilspp/singleton_holder.hpp | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index bb45b2abfe..3698e154ce 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -48,8 +48,8 @@ main (int argc, char **argv) {
Qt::WDestructiveClose |
Qt::WStyle_Customize |
Qt::WStyle_NoBorder);
- Manager::instance().init();
Manager::instance().setGui(GUI);
+ Manager::instance().init();
a.setMainWidget((QtGUIMainWindow*)GUI);
return a.exec();
diff --git a/utilspp/singleton_holder.hpp b/utilspp/singleton_holder.hpp
index 2d87ceeba3..730e4cee18 100644
--- a/utilspp/singleton_holder.hpp
+++ b/utilspp/singleton_holder.hpp
@@ -28,7 +28,6 @@
#include "creation_using_new.hpp"
#include "lifetime_default.hpp"
-#include "lifetime_with_longevity.hpp"
#include "threading_single.hpp"
namespace utilspp
--
GitLab