Fixed a problem preventing the plot form getting closed correctly. This did prevent the application from terminating when asked to exit by the operating system (for example at shutdown).

This commit is contained in:
Michael Möller
2011-06-04 13:27:11 +00:00
parent 049f3d3515
commit 357498a063

View File

@@ -315,12 +315,17 @@ namespace OpenHardwareMonitor.GUI {
break;
}
};
plotForm.Closing += delegate(object sender, CancelEventArgs e) {
if (plotLocation.Value == 0) {
showPlot.Value = false;
plotForm.FormClosing += delegate(object sender, FormClosingEventArgs e) {
if (e.CloseReason == CloseReason.UserClosing) {
// just switch off the plotting when the user closes the form
if (plotLocation.Value == 0) {
showPlot.Value = false;
}
e.Cancel = true;
}
e.Cancel = true;
};
EventHandler moveOrResizePlotForm = delegate(object sender, EventArgs e) {
if (plotForm.WindowState != FormWindowState.Minimized) {
settings.SetValue("plotForm.Location.X", plotForm.Bounds.X);