diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp
index 286ac56e1..97120ab7d 100644
--- a/src/slic3r/GUI/MediaFilePanel.cpp
+++ b/src/slic3r/GUI/MediaFilePanel.cpp
@@ -205,6 +205,8 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent)
     };
     Bind(wxEVT_SHOW, onShowHide);
     parent->GetParent()->Bind(wxEVT_SHOW, onShowHide);
+
+    m_lan_user = "bblp";
 }
 
 MediaFilePanel::~MediaFilePanel()
diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
index df5fd91dd..c212d5e72 100644
--- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
+++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
@@ -1550,7 +1550,9 @@ void PrinterFileSystem::Reconnect(boost::unique_lock<boost::mutex> &l, int resul
                     ret = Bambu_StartStreamEx
                         ? Bambu_StartStreamEx(tunnel, CTRL_TYPE)
                         : Bambu_StartStream(tunnel, false);
-                } while (ret == Bambu_would_block);
+                    if (ret == Bambu_would_block)
+                        boost::this_thread::sleep(boost::posix_time::milliseconds(100));
+                } while (ret == Bambu_would_block && !m_stopped);
             l.lock();
             if (ret == 0) {
                 m_session.tunnel = tunnel;
diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.h b/src/slic3r/GUI/Printer/PrinterFileSystem.h
index 0aea95c57..c86d3bf51 100644
--- a/src/slic3r/GUI/Printer/PrinterFileSystem.h
+++ b/src/slic3r/GUI/Printer/PrinterFileSystem.h
@@ -197,7 +197,7 @@ public:
     size_t GetIndexAtTime(boost::uint32_t time);
 
     void ToggleSelect(size_t index);
-    
+
     void SelectAll(bool select);
 
     size_t GetSelectCount() const;
@@ -210,12 +210,12 @@ public:
 
     enum Status {
         Initializing,
-        Connecting, 
+        Connecting,
         ListSyncing,
         ListReady,
         Failed,
     };
-    
+
     Status GetStatus() const { return m_status; }
     int GetLastError() const { return m_last_error; }