This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 5682d6f update .ts files from code files new a3f5434 Avoid unitialised variables on early calls of ONMainWindow::closeEvent() or ONMainWindow::closeClient(). (Fixes: #253). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ onmainwindow.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a3f54345646ce35eea731eeedec1550f6551f606 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jun 29 21:46:53 2014 +0200 Avoid unitialised variables on early calls of ONMainWindow::closeEvent() or ONMainWindow::closeClient(). (Fixes: #253). --- debian/changelog | 2 ++ onmainwindow.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3ae0219..5751587 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low - Add new cmdline option --hide-foldersharing. If used, all GUI elements related to exporting client-side folders to X2Go sessions get hidden. (Fixes: #514). + - Avoid unitialised variables on early calls of ONMainWindow::closeEvent() + or ONMainWindow::closeClient(). (Fixes: #253). * debian/control: + Add dbg:package x2goplugin-dbg. diff --git a/onmainwindow.cpp b/onmainwindow.cpp index d4fef23..16d30d7 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -117,6 +117,12 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) resumeAfterSuspending=false; forceToShowTrayicon=false; + # Initialize at least these variables before they get filled via loadSettings() + # They have to be initialized as they are used in closeEvent() and closeClient()... + trayIcon=false; + useLdap=false; + trayNoClose=false; + appSeparator=0; config.brokerNoAuth=false; config.brokerAutologin=false; @@ -259,7 +265,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) trayIconMenu=NULL; trayAutoHidden=false; - trayEnabled=trayMinToTray=trayNoclose=trayMinCon=trayMaxDiscon=false; + trayEnabled=trayMinToTray=trayMinCon=trayMaxDiscon=false; trayIconInit(); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org