Commit 401bd65

Nick committed on
Fixing the windows-not-closing bug more
commit 401bd65834d5c23d82d327b565e30fbbe2503781 parent 32f1581
5 changed files +21−20
ModifiedGBEmu.lpi +5−4
@@ -27,7 +27,7 @@
27 <Filename Value="Release\hUGETracker"/> 27 <Filename Value="Release\hUGETracker"/>
28 </Target> 28 </Target>
29 <SearchPaths> 29 <SearchPaths>
30 <IncludeFiles Value="GPU;CPU;Sound;Global;$(ProjOutDir)"/> 30 <IncludeFiles Value="CPU;Sound;Global;$(ProjOutDir)"/>
31 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/> 31 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/>
32 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/> 32 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/>
33 </SearchPaths> 33 </SearchPaths>
@@ -83,8 +83,8 @@
83 <Filename Value="Release\hUGETracker"/> 83 <Filename Value="Release\hUGETracker"/>
84 </Target> 84 </Target>
85 <SearchPaths> 85 <SearchPaths>
86 <IncludeFiles Value="GPU;CPU;Sound;Global;$(ProjOutDir)"/> 86 <IncludeFiles Value="Cpu;Sound;Global;$(ProjOutDir)"/>
87 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/> 87 <OtherUnitFiles Value="Cpu;Sound;Global;Pascal-SDL-2-Headers"/>
88 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/> 88 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/>
89 </SearchPaths> 89 </SearchPaths>
90 <Parsing> 90 <Parsing>
@@ -284,6 +284,7 @@
284 <Filename Value="options.pas"/> 284 <Filename Value="options.pas"/>
285 <IsPartOfProject Value="True"/> 285 <IsPartOfProject Value="True"/>
286 <ComponentName Value="frmOptions"/> 286 <ComponentName Value="frmOptions"/>
287 <HasResources Value="True"/>
287 <ResourceBaseClass Value="Form"/> 288 <ResourceBaseClass Value="Form"/>
288 </Unit22> 289 </Unit22>
289 </Units> 290 </Units>
@@ -292,7 +293,7 @@
292 <Version Value="11"/> 293 <Version Value="11"/>
293 <PathDelim Value="\"/> 294 <PathDelim Value="\"/>
294 <SearchPaths> 295 <SearchPaths>
295 <IncludeFiles Value="GPU;CPU;Sound;Global;$(ProjOutDir)"/> 296 <IncludeFiles Value="CPU;Sound;Global;$(ProjOutDir)"/>
296 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/> 297 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/>
297 <UnitOutputDirectory Value="lib\Development\$(TargetCPU)-$(TargetOS)"/> 298 <UnitOutputDirectory Value="lib\Development\$(TargetCPU)-$(TargetOS)"/>
298 </SearchPaths> 299 </SearchPaths>
ModifiedGBEmu.lpr +2−1
@@ -27,7 +27,8 @@ uses
27 Z80CPU in 'CPU\z80cpu.pas', 27 Z80CPU in 'CPU\z80cpu.pas',
28 sound in 'Sound\sound.pas', 28 sound in 'Sound\sound.pas',
29 vars in 'Global\vars.pas', 29 vars in 'Global\vars.pas',
30 mainloop in 'mainloop.pas', options; 30 mainloop in 'mainloop.pas',
31 options in 'options.pas';
31 32
32 {.$R *.RES} 33 {.$R *.RES}
33 34
Modifiedoptions.lfm +8−8
@@ -1,12 +1,12 @@
1 object frmOptions: TfrmOptions 1 object frmOptions: TfrmOptions
2 Left = 739 2 Left = 1762
3 Height = 300 3 Height = 849
4 Top = 371 4 Top = 212
5 Width = 614 5 Width = 762
6 BorderStyle = bsDialog 6 BorderStyle = bsDialog
7 Caption = 'Options' 7 Caption = 'Options'
8 ClientHeight = 300 8 ClientHeight = 849
9 ClientWidth = 614 9 ClientWidth = 762
10 DesignTimePPI = 168 10 DesignTimePPI = 168
11 LCLVersion = '2.0.6.0' 11 LCLVersion = '2.0.6.0'
12 object Label1: TLabel 12 object Label1: TLabel
@@ -18,9 +18,9 @@ object frmOptions: TfrmOptions
18 ParentColor = False 18 ParentColor = False
19 end 19 end
20 object Button1: TButton 20 object Button1: TButton
21 Left = 200 21 Left = 520
22 Height = 44 22 Height = 44
23 Top = 224 23 Top = 784
24 Width = 216 24 Width = 216
25 Caption = 'OK' 25 Caption = 'OK'
26 OnClick = Button1Click 26 OnClick = Button1Click
Modifiedtracker.lfm +5−7
@@ -1,7 +1,7 @@
1 object frmTracker: TfrmTracker 1 object frmTracker: TfrmTracker
2 Left = 998 2 Left = 966
3 Height = 1250 3 Height = 1250
4 Top = 237 4 Top = 361
5 Width = 2067 5 Width = 2067
6 Caption = 'hUGETracker' 6 Caption = 'hUGETracker'
7 ClientHeight = 1216 7 ClientHeight = 1216
@@ -57,10 +57,10 @@ object frmTracker: TfrmTracker
57 Height = 820 57 Height = 820
58 Top = 0 58 Top = 0
59 Width = 1720 59 Width = 1720
60 ActivePage = PatternTabSheet 60 ActivePage = InstrumentTabSheet
61 Align = alClient 61 Align = alClient
62 ParentFont = False 62 ParentFont = False
63 TabIndex = 1 63 TabIndex = 2
64 TabOrder = 0 64 TabOrder = 0
65 object GeneralTabSheet: TTabSheet 65 object GeneralTabSheet: TTabSheet
66 Caption = 'General' 66 Caption = 'General'
@@ -1533,7 +1533,6 @@ object frmTracker: TfrmTracker
1533 Width = 308 1533 Width = 308
1534 MaxValue = 15 1534 MaxValue = 15
1535 MinValue = 1 1535 MinValue = 1
1536 OnChange = InstrumentNumberSpinnerChange
1537 ParentFont = False 1536 ParentFont = False
1538 TabOrder = 1 1537 TabOrder = 1
1539 Value = 1 1538 Value = 1
@@ -1949,7 +1948,6 @@ object frmTracker: TfrmTracker
1949 end 1948 end
1950 object DebugPlayNoteButton: TMenuItem 1949 object DebugPlayNoteButton: TMenuItem
1951 Caption = 'Debug play note' 1950 Caption = 'Debug play note'
1952 Visible = False
1953 OnClick = DebugPlayNoteButtonClick 1951 OnClick = DebugPlayNoteButtonClick
1954 end 1952 end
1955 object DebugShiteButton: TMenuItem 1953 object DebugShiteButton: TMenuItem
@@ -4872,7 +4870,7 @@ object frmTracker: TfrmTracker
4872 } 4870 }
4873 end 4871 end
4874 object OscilloscopeUpdateTimer: TTimer 4872 object OscilloscopeUpdateTimer: TTimer
4875 Interval = 25 4873 Interval = 200
4876 OnTimer = OscilloscopeUpdateTimerTimer 4874 OnTimer = OscilloscopeUpdateTimerTimer
4877 left = 504 4875 left = 504
4878 top = 81 4876 top = 81
Modifiedtracker.pas +1−0
@@ -1491,6 +1491,7 @@ begin
1491 if Max1 > LEDMeter1.Position then LEDMeter1.Position := Max1; 1491 if Max1 > LEDMeter1.Position then LEDMeter1.Position := Max1;
1492 if Max2 > LEDMeter2.Position then LEDMeter2.Position := Max2; 1492 if Max2 > LEDMeter2.Position then LEDMeter2.Position := Max2;
1493 1493
1494 Application.ProcessMessages;
1494 PerformingOscilloscopeUpdate := False; 1495 PerformingOscilloscopeUpdate := False;
1495 end; 1496 end;
1496 1497