From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Tue, 2 Oct 2012 13:09:52 +0000 (+0900)
Subject: T29709
X-Git-Url: http://git.osdn.net/view?p=everfolder%2Fsource.git;a=commitdiff_plain;h=d3058b89cfe005648a1ee5742c7c7abd4a50c204

T29709
---

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index 48effbc..496dc99 100644
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -627,6 +627,16 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
 		isInCycle = false;
 	}
 
+	@Override
+	protected void onDestroy(){
+		if (receiver != null){
+			// 必ずonDestroy()が呼ばれるとは限らないが、仕方なく
+			unregisterReceiver(receiver);
+			receiver = null;
+		}
+		super.onDestroy();
+	}
+	
 	private void leftButtonOnClick() {
 		moveButtonOnClick(-1);
 		setStatus();
diff --git a/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
index 744477d..82f2602 100644
--- a/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
@@ -269,6 +269,16 @@ public class SettingActivity extends BaseActivity implements LockListener {
 	}
 
 	@Override
+	protected void onDestroy(){
+		if (broadcastReceiver != null){
+			// 必ずonDestroy()が呼ばれるとは限らないが、仕方なく
+			unregisterReceiver(broadcastReceiver);
+			broadcastReceiver = null;
+		}
+		super.onDestroy();
+	}
+	
+	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		isInit = true;
 	}