summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohann Latocha2011-06-06 20:40:10 +0200
committerJohann Latocha2011-06-06 20:40:10 +0200
commit2fde9ceb4c0525f3bdd00324ffb1670021de1103 (patch)
treed7f5352e6b9a42a1865c71d4d549041df414ec92
parentVersion update (diff)
downloadpvs-2fde9ceb4c0525f3bdd00324ffb1670021de1103.tar.gz
pvs-2fde9ceb4c0525f3bdd00324ffb1670021de1103.tar.xz
pvs-2fde9ceb4c0525f3bdd00324ffb1670021de1103.zip
Defect #824
-rw-r--r--src/gui/connectionWindow.cpp10
-rw-r--r--src/version.h2
2 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/connectionWindow.cpp b/src/gui/connectionWindow.cpp
index ec6db1b..afd7464 100644
--- a/src/gui/connectionWindow.cpp
+++ b/src/gui/connectionWindow.cpp
@@ -384,7 +384,8 @@ bool ConnectionWindow::unlockAllStations() {
bool ConnectionWindow::unprojectStations(QString sname) {
PVSClient* tmpConnection =
PVSConnectionManager::getManager()->getClientFromIp(sname);
- if (tmpConnection && tmpConnection->getVNCConnection()) {
+ if (tmpConnection)
+ {
tmpConnection->sendMessage(PVSCOMMAND, "UNPROJECT", "");
tmpConnection->getConnectionFrame()->setUnproject();
} else {
@@ -400,11 +401,8 @@ bool ConnectionWindow::unprojectAllStations() {
for (std::list<PVSClient*>::iterator it = listAll.begin(); it
!= listAll.end(); it++)
{
- if ((*it)->getVNCConnection())
- {
- (*it)->sendMessage(PVSCOMMAND, "UNPROJECT", "");
- (*it)->getConnectionFrame()->setUnproject();
- }
+ (*it)->sendMessage(PVSCOMMAND, "UNPROJECT", "");
+ (*it)->getConnectionFrame()->setUnproject();
}
return true;
}
diff --git a/src/version.h b/src/version.h
index 5522118..32e5877 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,2 @@
#define VERSION_STRING "3.1.2"
-#define VERSION_NUMBER 311
+#define VERSION_NUMBER 312