2 files changed, 4 insertions, 7 deletions
diff --git a/qt-models/gpslistmodel.cpp b/qt-models/gpslistmodel.cpp
index 8d874d67b..33eb8a5ea 100644
--- a/qt-models/gpslistmodel.cpp
+++ b/qt-models/gpslistmodel.cpp
@@ -3,11 +3,8 @@
 #include "core/qthelper.h"
 #include <QVector>
 
-GpsListModel *GpsListModel::m_instance = NULL;
-
-GpsListModel::GpsListModel(QObject *parent) : QAbstractListModel(parent)
+GpsListModel::GpsListModel()
 {
-	m_instance = this;
 }
 
 void GpsListModel::update()
@@ -65,6 +62,7 @@ QHash<int, QByteArray> GpsListModel::roleNames() const
 
 GpsListModel *GpsListModel::instance()
 {
-	return m_instance;
+	static GpsListModel self;
+	return &self;
 }
 
diff --git a/qt-models/gpslistmodel.h b/qt-models/gpslistmodel.h
index a1c82e5d6..e705825cc 100644
--- a/qt-models/gpslistmodel.h
+++ b/qt-models/gpslistmodel.h
@@ -20,7 +20,7 @@ public:
 	};
 
 	static GpsListModel *instance();
-	GpsListModel(QObject *parent = 0);
+	GpsListModel();
 	void clear();
 	int rowCount(const QModelIndex &parent = QModelIndex()) const;
 	QHash<int, QByteArray> roleNames() const;
@@ -28,7 +28,6 @@ public:
 	void update();
 private:
 	QVector<gpsTracker> m_gpsFixes;
-	static GpsListModel *m_instance;
 };
 
 #endif // GPSLISTMODEL_H