[X2Go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.0.1.2-24-gcaf8fd6

[X2Go dev team]

The branch, build-main has been updated
       via  caf8fd6bfb2f094a64effac706a7cb0202c2124b (commit)
      from  0d49dfdde6ee62e21c709de027a6f80576d88727 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 main.cpp         |    6 +++++-
 sharetray.h      |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ee8c58d..15d5308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low
     - Add signal handler so that unix signals can be handled within Qt.
     - Add script x2godesktopsharing-terminate: detect x2godesktopsharing process
       of a given session and terminate that process.
+    - Save settings and tidy up lock and socket file on X-Server crash.
   * Depend on x2goserver (>=3.0.99.6).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 13 Jun 2011 20:39:33 +0200
diff --git a/main.cpp b/main.cpp
index be7bb9b..d3733b5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -158,5 +158,9 @@ int main ( int argc, char *argv[] )
 	ShareTray* tray=new ShareTray;
 	tray->hide();
 	setup_unix_signal_handlers();
-	return app.exec();
+	try {
+		return app.exec();
+	} catch (const std::bad_alloc &) {
+		tray->slotMenuClose();
+	}
 }
diff --git a/sharetray.h b/sharetray.h
index 0441359..71c792a 100644
--- a/sharetray.h
+++ b/sharetray.h
@@ -69,6 +69,7 @@ public slots:
 	void handleSigTerm();
 	void handleSigAbort();
 	void handleSigHup();
+	void slotMenuClose();
 private slots:
 	void slotStopSharing();
 	void slotStartSharing();
@@ -82,7 +83,6 @@ private slots:
 	void slotMsgClose(QAbstractButton*);
 	void slotMsgOkCancel(QAbstractButton* button);
 	void slotDelListItem();
-	void slotMenuClose();
 	void slotUpdateLockFile();
 private:
 	int getAccess(QString user, QString host);


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).