eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix for close dialog with cross button

Browse source
This commit is contained in:
Volker Fischer 2011-04-23 21:35:13 +00:00
parent 7f924e1240
commit c4e0e6e000
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/connectdlg.h
View file

@ -65,7 +65,7 @@ public:
const int iPingTime, const int iPingTime,
const int iPingTimeLEDColor ); const int iPingTimeLEDColor );
bool GetCancelPressed() const { return bCancelPressed; } bool GetStateOK() const { return bStateOK; }
bool GetServerListItemWasChosen() const { return bServerListItemWasChosen; } bool GetServerListItemWasChosen() const { return bServerListItemWasChosen; }
QString GetSelectedAddress() const { return strSelectedAddress; } QString GetSelectedAddress() const { return strSelectedAddress; }
@ -79,12 +79,12 @@ protected:
CVector<QString> vstrIPAddresses; CVector<QString> vstrIPAddresses;
QString strSelectedAddress; QString strSelectedAddress;
bool bServerListReceived; bool bServerListReceived;
bool bCancelPressed; bool bStateOK;
bool bServerListItemWasChosen; bool bServerListItemWasChosen;
public slots: public slots:
void OnServerListItemDoubleClicked ( QTreeWidgetItem* Item, int ); void OnServerListItemDoubleClicked ( QTreeWidgetItem* Item, int );
void OnCancelButtonClicked(); void OnConnectButtonClicked();
void OnTimerPing(); void OnTimerPing();
void OnTimerReRequestServList(); void OnTimerReRequestServList();

4
src/llconclientdlg.cpp
View file

@ -734,8 +734,8 @@ void CLlconClientDlg::ConnectDisconnect ( const bool bDoStart )
ConnectDlg.LoadStoredServers ( pClient->vstrIPAddress ); ConnectDlg.LoadStoredServers ( pClient->vstrIPAddress );
ConnectDlg.exec(); ConnectDlg.exec();
// check if cancel was pressed // check if state is OK (e.g., no Cancel was pressed)
if ( !ConnectDlg.GetCancelPressed() ) if ( ConnectDlg.GetStateOK() )
{ {
const QString strSelectedAddress = ConnectDlg.GetSelectedAddress(); const QString strSelectedAddress = ConnectDlg.GetSelectedAddress();