Skip to content

Commit

Permalink
Preliminary commit for 1.6.1
Browse files Browse the repository at this point in the history
Reworked the window message API for 86Box to fix status issues with confirmation dialogs
86Box instance is now focused when a confirmation dialog is triggered for shutdown or hard reset
ListView selection is now cleared when sorting only when more than one item is selected
Fixed issue 86Box#70
  • Loading branch information
daviunic committed Nov 2, 2019
1 parent 2d1c0d1 commit 69897a3
Show file tree
Hide file tree
Showing 3 changed files with 166 additions and 129 deletions.
4 changes: 2 additions & 2 deletions 86BoxManager/VM.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class VM
public int Pid { get; set; } //Process ID of 86box.exe running the VM
public const int STATUS_STOPPED = 0; //VM is not running
public const int STATUS_RUNNING = 1; //VM is running
public const int STATUS_IN_SETTINGS = 2; //Only the settings window is open
public const int STATUS_WAITING = 2; //VM is waiting for user response
public const int STATUS_PAUSED = 3; //VM is paused

public VM(){
Expand Down Expand Up @@ -46,7 +46,7 @@ public string GetStatusString()
case STATUS_STOPPED: return "Stopped";
case STATUS_RUNNING: return "Running";
case STATUS_PAUSED: return "Paused";
case STATUS_IN_SETTINGS: return "In settings";
case STATUS_WAITING: return "Waiting";
default: return "Invalid status";
}
}
Expand Down
Loading

0 comments on commit 69897a3

Please sign in to comment.