From 9e6e62d9c8606f4de825c75df92d58a2918adc82 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 11 Oct 2013 15:02:35 +0200
Subject: [PATCH] fix instant crash on windows again (followup dc3b56a1 and
 9d8d3178)

---
 src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp | 6 ++++--
 src/gui/editorwidgets/core/qgseditorwidgetregistry.h   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
index ee7b940c1c4..ac5bf3ed249 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
+++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -21,11 +21,13 @@
 #include "qgsmessagelog.h"
 
 
-QgsEditorWidgetRegistry  QgsEditorWidgetRegistry::sInstance;
+QgsEditorWidgetRegistry *QgsEditorWidgetRegistry::sInstance = 0;
 
 QgsEditorWidgetRegistry* QgsEditorWidgetRegistry::instance()
 {
-  return &sInstance;
+  if ( !sInstance )
+    sInstance = new QgsEditorWidgetRegistry();
+  return sInstance;
 }
 
 QgsEditorWidgetRegistry::QgsEditorWidgetRegistry()
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
index e740456ac6e..b1a5bf5ab48 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
+++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
@@ -112,7 +112,7 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
 
   private:
     QMap<QString, QgsEditorWidgetFactory*> mWidgetFactories;
-    static QgsEditorWidgetRegistry sInstance;
+    static QgsEditorWidgetRegistry *sInstance;
 };