blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull Requests 3 Actions Releases 10 Wiki Activity

WIP: fix: intialization ui/squawk.cpp before than Core::Squawk::ready #69

Closed
pavanvo wants to merge 1 commits from pavanvo:fix/init_ui_before_app into master
pull from: pavanvo:fix/init_ui_before_app
merge into: blue:master
Conversation 3 Commits 1 Files Changed 1 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 11da9c8ae5 - Show all commits

6
main/application.cpp
View File

@ -29,6 +29,7 @@ Application::Application(Core::Squawk* p_core):
destroyingSquawk(false), destroyingSquawk(false),
storage() storage()
{ {
squawk = new Squawk(roster);
connect(&roster, &Models::Roster::unnoticedMessage, this, &Application::notify); connect(&roster, &Models::Roster::unnoticedMessage, this, &Application::notify);
connect(&roster, &Models::Roster::unreadMessagesCountChanged, this, &Application::unreadMessagesCountChanged); connect(&roster, &Models::Roster::unreadMessagesCountChanged, this, &Application::unreadMessagesCountChanged);
@ -53,7 +54,7 @@ Application::Application(Core::Squawk* p_core):
connect(&roster, &Models::Roster::localPathInvalid, core, &Core::Squawk::onLocalPathInvalid); connect(&roster, &Models::Roster::localPathInvalid, core, &Core::Squawk::onLocalPathInvalid);
//coonecting backend to myself //connecting backend to myself
connect(core, &Core::Squawk::stateChanged, this, &Application::stateChanged); connect(core, &Core::Squawk::stateChanged, this, &Application::stateChanged);
connect(core, &Core::Squawk::accountMessage, &roster, &Models::Roster::addMessage); connect(core, &Core::Squawk::accountMessage, &roster, &Models::Roster::addMessage);
@ -147,8 +148,7 @@ void Application::checkForTheLastWindow()
void Application::createMainWindow() void Application::createMainWindow()
{ {
if (squawk == nullptr) { if (squawk) {
squawk = new Squawk(roster);
connect(squawk, &Squawk::notify, this, &Application::notify); connect(squawk, &Squawk::notify, this, &Application::notify);
connect(squawk, &Squawk::changeSubscription, this, &Application::changeSubscription); connect(squawk, &Squawk::changeSubscription, this, &Application::changeSubscription);