Skip to content

Commit e69907b

Browse files
committed
修复切换关机、删除记录的bug
1 parent 355f882 commit e69907b

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

TimeControl/Properties/launchSettings.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@
88
"nativeDebugging": false,
99
"remoteDebugEnabled": true,
1010
"authenticationMode": "Windows",
11-
"remoteDebugMachine": "192.168.31.90:6666"
12-
},
13-
"RedMiRemote": {
14-
"commandName": "Project",
15-
"remoteDebugEnabled": true,
16-
"remoteDebugMachine": "192.168.31.134:6666",
17-
"authenticationMode": "Windows"
11+
"remoteDebugMachine": "VMWIN10:4026"
1812
}
1913
}
2014
}

TimeControl/Windows/ControlPanel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ private void StartLock(string unlockPasswordHash, int minutes = 0)
206206
private void ShowAndSave(TimeSpan timeSpan)
207207
{
208208
ResultWindow resultWindow = new(timeSpan);
209-
resultWindow.Show();
209+
resultWindow.ShowDialog();
210210
if (ResultWindow.IsSave == true)
211211
timeData.AddTime(timeSpan);
212212
RefreshAndSaveData();

TimeControl/Windows/Lock.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ private void Lock_FormClosing(object sender, FormClosingEventArgs e)
8181
{
8282
File.Delete(TCFile.TempTimeFile);
8383
TempTimeSpan = DateTime.Now - startTime;
84-
SystemControl.Shutdown();
8584
}
8685
}
8786

@@ -123,6 +122,8 @@ private void changeButton_Click(object sender, EventArgs e)
123122
== DialogResult.OK)
124123
{
125124
File.Move(TCFile.TempTimeFile, TCFile.DeepTempTimeFile);
125+
SystemControl.Shutdown();
126+
Environment.Exit(0);
126127
}
127128
}
128129
}

TimeControl/Windows/ResultWindow.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public ResultWindow(TimeSpan timeSpan)
2323
private void deleteButton_Click(object sender, EventArgs e)
2424
{
2525
IsSave=false;
26+
Close();
2627
}
2728
}
2829
}

0 commit comments

Comments
 (0)