projects
/
speedfreak
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d0cd7d9
)
Added function to kill usersDialog when dialog is closed.
author
Janne Änäkkälä
<janne_anakkala@hotmail.com>
Thu, 27 May 2010 07:33:05 +0000
(10:33 +0300)
committer
Janne Änäkkälä
<janne_anakkala@hotmail.com>
Thu, 27 May 2010 07:33:05 +0000
(10:33 +0300)
Client/mainwindow.cpp
patch
|
blob
|
history
diff --git
a/Client/mainwindow.cpp
b/Client/mainwindow.cpp
index
27a1f4b
..
f86681c
100644
(file)
--- a/
Client/mainwindow.cpp
+++ b/
Client/mainwindow.cpp
@@
-168,6
+168,9
@@
MainWindow::~MainWindow()
if(helpDialog)
delete helpDialog;
if(helpDialog)
delete helpDialog;
+ if(usersDialog)
+ delete usersDialog;
+
if(customButtonAccelerate)
delete customButtonAccelerate;
if(customButtonRoute)
if(customButtonAccelerate)
delete customButtonAccelerate;
if(customButtonRoute)
@@
-343,6
+346,12
@@
void MainWindow::killDialog()
delete helpDialog;
helpDialog = NULL;
}
delete helpDialog;
helpDialog = NULL;
}
+ if(usersDialog)
+ {
+ qDebug() << "__MW kill: usersDialog";
+ delete usersDialog;
+ usersDialog = NULL;
+ }
}
/**
}
/**
@@
-464,5
+473,6
@@
void MainWindow::on_pushButtonUsers_clicked()
connect(usersDialog, SIGNAL(getUserInfo(QString)), this, SLOT(requestGetUserInfo(QString)));
//connect(usersDialog, SIGNAL(getUsers()), this, SLOT(requestGetUsers()));
requestGetUsers();
connect(usersDialog, SIGNAL(getUserInfo(QString)), this, SLOT(requestGetUserInfo(QString)));
//connect(usersDialog, SIGNAL(getUsers()), this, SLOT(requestGetUsers()));
requestGetUsers();
+ connect(usersDialog, SIGNAL(rejected()), this, SLOT(killDialog()));
usersDialog->show();
}
usersDialog->show();
}