From 97f8879dded4936ebdb893c9dc339e8fe76e335e Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Fri, 8 Jan 2010 18:13:42 +0000
Subject: Make sure we clear notifications before death

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@466 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml                             | 2 +-
 src/org/connectbot/service/TerminalManager.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df7d15c..f5def67 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.7-dev"
-	android:versionCode="245">
+	android:versionCode="246">
 
 	<application
 		android:icon="@drawable/icon"
diff --git a/src/org/connectbot/service/TerminalManager.java b/src/org/connectbot/service/TerminalManager.java
index e4f4841..cb7d35d 100644
--- a/src/org/connectbot/service/TerminalManager.java
+++ b/src/org/connectbot/service/TerminalManager.java
@@ -184,6 +184,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 		if (wifilock != null && wifilock.isHeld())
 			wifilock.release();
 
+		ConnectionNotifier.getInstance().hideRunningNotification(this);
+
 		disableMediaPlayer();
 	}
 
@@ -386,7 +388,6 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 
 	protected void stopNow() {
 		if (bridges.size() == 0) {
-			ConnectionNotifier.getInstance().hideRunningNotification(this);
 			stopSelf();
 		}
 	}
@@ -410,6 +411,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 
 		setResizeAllowed(true);
 
+		ConnectionNotifier.getInstance().hideRunningNotification(this);
+
 		stopIdleTimer();
 
 		// Make sure we stay running to maintain the bridges
-- 
cgit v1.2.3