projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent core from crashing if networks are removed while reconnecting.
[quassel.git]
/
src
/
qtui
/
coreconnectdlg.cpp
diff --git
a/src/qtui/coreconnectdlg.cpp
b/src/qtui/coreconnectdlg.cpp
index
909592e
..
7490cb4
100644
(file)
--- a/
src/qtui/coreconnectdlg.cpp
+++ b/
src/qtui/coreconnectdlg.cpp
@@
-28,9
+28,14
@@
#include "clientsyncer.h"
#include "coreconfigwizard.h"
#include "clientsyncer.h"
#include "coreconfigwizard.h"
-CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(parent) {
+CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect)
+ : QDialog(parent)
+{
ui.setupUi(this);
ui.setupUi(this);
+ // make it look more native under Mac OS X:
+ setWindowFlags(Qt::Sheet);
+
clientSyncer = new ClientSyncer(this);
wizard = 0;
clientSyncer = new ClientSyncer(this);
wizard = 0;
@@
-47,6
+52,7
@@
CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare
foreach(AccountId id, s.knownAccounts()) {
if(!id.isValid()) continue;
QVariantMap data = s.retrieveAccountData(id);
foreach(AccountId id, s.knownAccounts()) {
if(!id.isValid()) continue;
QVariantMap data = s.retrieveAccountData(id);
+ data["AccountId"] = QVariant::fromValue<AccountId>(id);
accounts[id] = data;
QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList);
item->setData(Qt::UserRole, QVariant::fromValue<AccountId>(id));
accounts[id] = data;
QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList);
item->setData(Qt::UserRole, QVariant::fromValue<AccountId>(id));