# HG changeset patch # User sheepluva # Date 1351264888 -7200 # Node ID 3df73ec7fcf27fcef950cf89dfbdf067b66d3042 # Parent 46f1155690455cb66a603e3049b0fe6751f1db07 disable F5 key and data refresh diff -r 46f115569045 -r 3df73ec7fcf2 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Fri Oct 26 17:05:12 2012 +0200 +++ b/QTfrontend/hwform.cpp Fri Oct 26 17:21:28 2012 +0200 @@ -163,8 +163,8 @@ // ctrl+q closes frontend for consistency QShortcut * closeFrontend = new QShortcut(QKeySequence("Ctrl+Q"), this); connect (closeFrontend, SIGNAL(activated()), this, SLOT(close())); - QShortcut * updateData = new QShortcut(QKeySequence("F5"), this); - connect (updateData, SIGNAL(activated()), &DataManager::instance(), SLOT(reload())); + //QShortcut * updateData = new QShortcut(QKeySequence("F5"), this); + //connect (updateData, SIGNAL(activated()), &DataManager::instance(), SLOT(reload())); #endif UpdateTeamsLists(); diff -r 46f115569045 -r 3df73ec7fcf2 QTfrontend/ui/page/pagedata.cpp --- a/QTfrontend/ui/page/pagedata.cpp Fri Oct 26 17:05:12 2012 +0200 +++ b/QTfrontend/ui/page/pagedata.cpp Fri Oct 26 17:21:28 2012 +0200 @@ -245,6 +245,6 @@ if (m_contentDownloaded) { m_contentDownloaded = false; - DataManager::instance().reload(); + //DataManager::instance().reload(); } } diff -r 46f115569045 -r 3df73ec7fcf2 QTfrontend/util/DataManager.cpp --- a/QTfrontend/util/DataManager.cpp Fri Oct 26 17:05:12 2012 +0200 +++ b/QTfrontend/util/DataManager.cpp Fri Oct 26 17:21:28 2012 +0200 @@ -201,11 +201,9 @@ void DataManager::reload() { - m_gameStyleModel->loadGameStyles(); - m_hatModel->loadHats(); - m_mapModel->loadMaps(); - m_themeModel->loadThemes(); - emit updated(); + // removed for now (also code was a bit unclean, could lead to segfault if + // reload() is called before all members are initialized - because currently + // they are initialized in the getter methods rather than the constructor) } void DataManager::resetColors()