1 files changed, 6 insertions, 3 deletions
diff --git a/app/src/main/java/com/clusterrr/usbserialtelnetserver/BootCompletedReceiver.java b/app/src/main/java/com/clusterrr/usbserialtelnetserver/BootCompletedReceiver.java
index 3a80fba..23cda8b 100644
--- a/app/src/main/java/com/clusterrr/usbserialtelnetserver/BootCompletedReceiver.java
+++ b/app/src/main/java/com/clusterrr/usbserialtelnetserver/BootCompletedReceiver.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
+import android.util.Log;
 
 import com.hoho.android.usbserial.driver.UsbSerialPort;
 
@@ -12,11 +13,13 @@ public class BootCompletedReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        // App was started before shutdown
         SharedPreferences prefs = context.getApplicationContext().getSharedPreferences(context.getString(R.string.app_name), Context.MODE_PRIVATE);
-        boolean needToStart = prefs.getBoolean(UsbSerialTelnetService.KEY_LAST_STATE, false);
-        if (needToStart) {
+        if ((prefs.getInt(MainActivity.SETTING_AUTOSTART, MainActivity.AUTOSTART_DISABLED) != MainActivity.AUTOSTART_DISABLED)
+            && MainActivity.isDevicePresent(context))
+        {
             Intent mainActivityStartIntent = new Intent(context, MainActivity.class);
+            mainActivityStartIntent.setAction(intent.getAction());
+            mainActivityStartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(mainActivityStartIntent);
         }
     }