3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 19:28:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix precedence errors (#3611)

Browse source 
Fix a handful of precedence errors and 1 logic/precedence error.  None of the code will compile as intended without these changes.

Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
foghatredbird 2024-01-15 06:35:08 -08:00 • committed by GitHub
parent 9b76f51bd3
commit 1615832236
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/Monitor.cpp
View file

@ -444,14 +444,14 @@ void MonitorPanel::show_status(int status)
{
if (!m_initialized) return;
if (last_status == status)return;
if (last_status & (int)MonitorStatus::MONITOR_CONNECTING != 0) {
if ((last_status & (int)MonitorStatus::MONITOR_CONNECTING) != 0) {
NetworkAgent* agent = wxGetApp().getAgent();
json j;
j["dev_id"] = obj ? obj->dev_id : "obj_nullptr";
if (status & (int)MonitorStatus::MONITOR_DISCONNECTED != 0) {
if ((status & (int)MonitorStatus::MONITOR_DISCONNECTED) != 0) {
j["result"] = "failed";
}
else if (status & (int)MonitorStatus::MONITOR_NORMAL != 0) {
else if ((status & (int)MonitorStatus::MONITOR_NORMAL) != 0) {
j["result"] = "success";
}
}