Index: src/org/adblockplus/android/ProxyService.java |
=================================================================== |
--- a/src/org/adblockplus/android/ProxyService.java |
+++ b/src/org/adblockplus/android/ProxyService.java |
@@ -312,7 +312,8 @@ |
sendBroadcast(new Intent(BROADCAST_STATE_CHANGED).putExtra("enabled", false)); |
// Stop proxy server |
- proxy.close(); |
+ if (proxy != null) |
Felix Dahlke
2012/11/28 08:35:38
When can the proxy be null here? When an exception
Andrey Novikov
2013/02/22 08:31:32
Not only on exception. I do not know why but it's
Felix Dahlke
2013/02/22 08:35:03
So onDestroy is sometimes called without onCreate
|
+ proxy.close(); |
// Stop engine if not in interactive mode |
AdblockPlus.getApplication().stopEngine(false); |