mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: local file proto 

Change-Id: Ie45dc223a027e3855f1242bfeed2f346b1df600f
Jira: none
This commit is contained in:
chunmao.guo 2024-10-24 10:09:56 +08:00 committed by lane.wei
parent 9f85798a0b
commit e709ddacc8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/MediaFilePanel.cpp
View File

@ -205,6 +205,8 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent)
}; };
Bind(wxEVT_SHOW, onShowHide); Bind(wxEVT_SHOW, onShowHide);
parent->GetParent()->Bind(wxEVT_SHOW, onShowHide); parent->GetParent()->Bind(wxEVT_SHOW, onShowHide);
m_lan_user = "bblp";
} }
MediaFilePanel::~MediaFilePanel() MediaFilePanel::~MediaFilePanel()

4
src/slic3r/GUI/Printer/PrinterFileSystem.cpp
View File

@ -1550,7 +1550,9 @@ void PrinterFileSystem::Reconnect(boost::unique_lock<boost::mutex> &l, int resul
ret = Bambu_StartStreamEx ret = Bambu_StartStreamEx
? Bambu_StartStreamEx(tunnel, CTRL_TYPE) ? Bambu_StartStreamEx(tunnel, CTRL_TYPE)
: Bambu_StartStream(tunnel, false); : 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(); l.lock();
if (ret == 0) { if (ret == 0) {
m_session.tunnel = tunnel; m_session.tunnel = tunnel;

6
src/slic3r/GUI/Printer/PrinterFileSystem.h
View File

@ -197,7 +197,7 @@ public:
size_t GetIndexAtTime(boost::uint32_t time); size_t GetIndexAtTime(boost::uint32_t time);
void ToggleSelect(size_t index); void ToggleSelect(size_t index);
void SelectAll(bool select); void SelectAll(bool select);
size_t GetSelectCount() const; size_t GetSelectCount() const;
@ -210,12 +210,12 @@ public:
enum Status { enum Status {
Initializing, Initializing,
Connecting, Connecting,
ListSyncing, ListSyncing,
ListReady, ListReady,
Failed, Failed,
}; };
Status GetStatus() const { return m_status; } Status GetStatus() const { return m_status; }
int GetLastError() const { return m_last_error; } int GetLastError() const { return m_last_error; }