diff options
| author | Alex Borisov <b0ric.alex@gmail.com> | 2012-02-02 01:13:09 +0200 |
|---|---|---|
| committer | Alex Borisov <b0ric.alex@gmail.com> | 2012-02-02 01:13:09 +0200 |
| commit | a28bcf808ad8aad43eb7ce719ed6b595993e1d7a (patch) | |
| tree | fdc43102ec6b9a26064db122b24c35bb0459b615 | |
| parent | 873642c0d898f3152b251a783bf4cdef47070d4c (diff) | |
FIX: empty window when no Proxifier config present
| -rw-r--r-- | client/Dialog.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/client/Dialog.cpp b/client/Dialog.cpp index 4217fb0..c9b9956 100644 --- a/client/Dialog.cpp +++ b/client/Dialog.cpp @@ -14,12 +14,10 @@ using namespace std; ProxyDialog::ProxyDialog(QWidget *parent): QDialog(parent, Qt::Popup) { UpdatedConfig *cfg = UpdatedConfig::CurrentConfig(); - Proxifier *proxifier = Proxifier::GetInstance(); if (!proxifier->IsValid()) { - Logger::Fatal("No valid proxifier configuration file found!\n"); - return; + Logger::Error("No valid proxifier configuration file found!\n"); } connect(this, SIGNAL(finished(int)), this, SLOT(Closed(int))); @@ -95,7 +93,14 @@ ProxyDialog::ProxyDialog(QWidget *parent): QDialog(parent, Qt::Popup) QPushButton *btn = new QPushButton(); btn->setObjectName("bottomBtn"); btn->setCheckable(true); - btn->setChecked(proxifier->IsOn(staticProxyLine[j].host, staticProxyLine[j].port)); + if (proxifier->IsValid()) + { + btn->setChecked(proxifier->IsOn(staticProxyLine[j].host, staticProxyLine[j].port)); + } + else + { + btn->setChecked(false); + } btn->setProperty("proxyName", QString::fromLocal8Bit(staticProxyLine[j].name.c_str())); btn->setLayout(btnLayout); connect(btn, SIGNAL(toggled(bool)), this, SLOT(StaticProxyToggled(bool))); @@ -119,7 +124,8 @@ void ProxyDialog::Closed(int i) Proxifier *proxifier = Proxifier::GetInstance(); if (!proxifier->IsValid()) { - Logger::Fatal("No valid proxifier configuration file found!\n"); + Logger::Error("No valid proxifier configuration file found!\n"); + return; // do not restart if no config found } if (!proxifier->Restart()) { |