Commit c123bb62 authored by Rafał Malinowski's avatar Rafał Malinowski

core: #2758 fixed: crash during 0.6.6 configuration import

Signed-off-by: Rafał Malinowski's avatarRafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
parent 4317f140
......@@ -50,7 +50,9 @@ ContactManager * ContactManager::instance()
BuddyManager::instance();
Instance = new ContactManager();
Instance->init();
// moved from here because of #2758
// Instance->init();
}
return Instance;
......
......@@ -39,6 +39,8 @@ class KADUAPI ContactManager : public QObject, public Manager<Contact>
Q_OBJECT
Q_DISABLE_COPY(ContactManager)
friend class Core;
static ContactManager * Instance;
QList<Contact> DirtyContacts;
......
......@@ -791,6 +791,9 @@ void Core::runServices()
CurrentWebkitMessagesViewFactory->setChatStyleRendererFactoryProvider(CurrentChatStyleRendererFactoryProvider.get());
CurrentWebkitMessagesViewFactory->setImageStorageService(CurrentImageStorageService);
CurrentWebkitMessagesViewFactory->setWebkitMessagesViewHandlerFactory(CurrentWebkitMessagesViewHandlerFactory.get());
// moved here because of #2758
ContactManager::instance()->init();
}
void Core::runGuiServices()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment