From 0433bb7cef1ffca603bbcc61fa229d62467a8ea2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Enar=20V=C3=A4ikene?= <enar@vaikene.net>
Date: Thu, 1 Dec 2011 16:14:13 +0200
Subject: [PATCH] Moved iProp interface registration to the constructor to fix
a SEGFAULT in the iProp::instance() function.
---
src/libs/Common/prop.cpp | 6 +++---
src/libs/Common/version.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libs/Common/prop.cpp b/src/libs/Common/prop.cpp
index b3ccb6f..86d3b1e 100644
--- a/src/libs/Common/prop.cpp
+++ b/src/libs/Common/prop.cpp
@@ -47,6 +47,9 @@ Prop::Prop()
, mPersistentProps(0)
{
setObjectName(QString("%1.iProp").arg(VER_MODULE_NAME_STR));
+
+ // Register the iProp interface
+ iRegistry::instance()->registerInterface("iProp", this);
}
Prop::~Prop()
@@ -61,9 +64,6 @@ iProp * Prop::interface() const
bool Prop::init()
{
- // Register the iProp interface
- iRegistry::instance()->registerInterface("iProp", this);
-
// Set application name and language properties
setValue("applicationName", iApp::instance()->name());
setValue("applicationLanguage", iApp::instance()->language());
diff --git a/src/libs/Common/version.h b/src/libs/Common/version.h
index b164cb5..0a5f465 100644
--- a/src/libs/Common/version.h
+++ b/src/libs/Common/version.h
@@ -25,12 +25,12 @@
/**
* Module/library version number in the form major,minor,release,build
*/
-#define VER_FILE_VERSION 0,2,2,11
+#define VER_FILE_VERSION 0,2,3,12
/**
* Module/library version number in the string format (shall end with \0)
*/
-#define VER_FILE_VERSION_STR "0.2.2.11\0"
+#define VER_FILE_VERSION_STR "0.2.3.12\0"
/**
* Module/library name (shall end with \0)
--
2.49.0