4 files changed, 51 insertions, 12 deletions

diff --git a/apps/audio_path.c b/apps/audio_path.c
index bb73052a95..f908017bc3 100644
--- a/apps/audio_path.c
+++ b/apps/audio_path.c
@@ -169,10 +169,19 @@ int audio_get_spdif_sample_rate(void)
 #ifdef HAVE_SPEAKER
 void audio_enable_speaker(int mode)
 {
-#ifdef HAVE_HEADPHONE_DETECTION
+#if defined(HAVE_HEADPHONE_DETECTION) || defined(HAVE_LINEOUT_DETECTION)
     /* if needed, query jack state */
     if(mode == 2)
-        mode = !headphones_inserted();
+    {
+#ifdef HAVE_HEADPHONE_DETECTION
+        if (headphones_inserted())
+            mode = 0;
+#endif
+#ifdef HAVE_LINEOUT_DETECTION
+        if (lineout_inserted())
+            mode = 0;
+#endif
+    }
 #endif
     /* treat any nonzero value as enable */
     audiohw_enable_speaker(mode);
diff --git a/apps/misc.c b/apps/misc.c
index 2d60ecca49..d255eaf766 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -498,7 +498,7 @@ void car_adapter_mode_init(void)
 #ifdef HAVE_HEADPHONE_DETECTION
 static void hp_unplug_change(bool inserted)
 {
-    static bool headphone_caused_pause = false;
+    static bool headphone_caused_pause = true;
 
     if (global_settings.unplug_mode)
     {
@@ -526,7 +526,7 @@ static void hp_unplug_change(bool inserted)
     audio_enable_speaker(global_settings.speaker_mode);
 #endif
 }
-#endif
+#endif /*HAVE_HEADPHONE_DETECTION*/
 
 #ifdef HAVE_LINEOUT_DETECTION
 static void lo_unplug_change(bool inserted)
@@ -534,11 +534,32 @@ static void lo_unplug_change(bool inserted)
 #ifdef HAVE_LINEOUT_POWEROFF
     lineout_set(inserted);
 #else
-    (void)inserted;
-    audiohw_set_lineout_volume(0,0);
-#endif
+    audiohw_set_lineout_volume(0,0); /*hp vol re-set by this function as well*/
+    static bool lineout_caused_pause = true;
+
+    if (global_settings.unplug_mode)
+    {
+        int audio_stat = audio_status();
+        if (inserted)
+        {
+            backlight_on();
+            if ((audio_stat & AUDIO_STATUS_PLAY) &&
+                    lineout_caused_pause &&
+                    global_settings.unplug_mode > 1 )
+                unpause_action(true, true);
+            lineout_caused_pause = false;
+        } else {
+            if ((audio_stat & AUDIO_STATUS_PLAY) &&
+                    !(audio_stat & AUDIO_STATUS_PAUSE))
+            {
+                lineout_caused_pause = true;
+                pause_action(false, false);
+            }
+        }
+    }
+#endif /*HAVE_LINEOUT_POWEROFF*/
 }
-#endif
+#endif /*HAVE_LINEOUT_DETECTION*/
 
 long default_event_handler_ex(long event, void (*callback)(void *), void *parameter)
 {
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 2a8662a170..77a092018a 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -767,11 +767,20 @@ void root_menu(void)
     }
 #endif /* HAVE_RTC_ALARM */
 
+#if defined(HAVE_HEADPHONE_DETECTION) || defined(HAVE_LINEOUT_DETECTION)
+    if (next_screen == GO_TO_WPS && global_settings.unplug_autoresume)
+    {
+       next_screen = GO_TO_ROOT;
 #ifdef HAVE_HEADPHONE_DETECTION
-    if (next_screen == GO_TO_WPS &&
-        (global_settings.unplug_autoresume && !headphones_inserted() ))
-            next_screen = GO_TO_ROOT;
+        if (headphones_inserted())
+            next_screen = GO_TO_WPS;
+#endif
+#ifdef HAVE_LINEOUT_DETECTION
+        if (lineout_inserted())
+            next_screen = GO_TO_WPS;
 #endif
+    }
+#endif /*(HAVE_HEADPHONE_DETECTION) || (HAVE_LINEOUT_DETECTION)*/
 
     while (true)
     {
diff --git a/apps/settings.h b/apps/settings.h
index 405a31d052..ec66553660 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -448,7 +448,7 @@ struct user_settings
 #endif
 
     int  pause_rewind; /* time in s to rewind when pausing */
-#ifdef HAVE_HEADPHONE_DETECTION
+#if defined(HAVE_HEADPHONE_DETECTION) || defined(HAVE_LINEOUT_DETECTION)
     int  unplug_mode; /* pause on headphone unplug */
     bool unplug_autoresume; /* disable auto-resume if no phones */
 #endif