Skip to content

Commit 7a45527

Browse files
committed
FIX: freeze when trying to save tfkiss settings. #5
1 parent 4f48acb commit 7a45527

File tree

5 files changed

+42
-33
lines changed

5 files changed

+42
-33
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- ADD: Wayland support
66
- ADD: Dock Convers window at the Main Window.
77
- CHANGE: special aprsmap pipe mechanism to the PR-Modem pipes of FP.
8+
- FIX: freeze when trying to save tfkiss settings. #5
89

910
## v0.8.0
1011

src/flexpacket.lpi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<UseVersionInfo Value="True"/>
2424
<AutoIncrementBuild Value="True"/>
2525
<MinorVersionNr Value="8"/>
26-
<BuildNr Value="2611"/>
26+
<BuildNr Value="2615"/>
2727
<Language Value="0C0C"/>
2828
<StringTable InternalName="flexpacket" ProductName="flexpacket" ProductVersion="0.8.0"/>
2929
</VersionInfo>

src/flexpacket.lps

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<UnitName Value="UMain"/>
2222
<IsVisibleTab Value="True"/>
2323
<EditorIndex Value="15"/>
24-
<TopLine Value="1301"/>
25-
<CursorPos X="40" Y="1314"/>
24+
<TopLine Value="643"/>
25+
<CursorPos X="11" Y="650"/>
2626
<UsageCount Value="210"/>
2727
<Loaded Value="True"/>
2828
<LoadedDesigner Value="True"/>
@@ -31,8 +31,8 @@
3131
<Filename Value="uhostmode.pas"/>
3232
<IsPartOfProject Value="True"/>
3333
<EditorIndex Value="9"/>
34-
<TopLine Value="141"/>
35-
<CursorPos X="11" Y="156"/>
34+
<TopLine Value="505"/>
35+
<CursorPos X="5" Y="526"/>
3636
<UsageCount Value="214"/>
3737
<Loaded Value="True"/>
3838
</Unit>
@@ -54,6 +54,7 @@
5454
<HasResources Value="True"/>
5555
<ResourceBaseClass Value="Form"/>
5656
<EditorIndex Value="18"/>
57+
<TopLine Value="43"/>
5758
<CursorPos X="11"/>
5859
<UsageCount Value="220"/>
5960
<Loaded Value="True"/>
@@ -63,8 +64,8 @@
6364
<Filename Value="utypes.pas"/>
6465
<IsPartOfProject Value="True"/>
6566
<EditorIndex Value="19"/>
66-
<TopLine Value="31"/>
67-
<CursorPos X="21" Y="58"/>
67+
<TopLine Value="167"/>
68+
<CursorPos X="3" Y="171"/>
6869
<UsageCount Value="357"/>
6970
<Loaded Value="True"/>
7071
</Unit>
@@ -277,30 +278,6 @@
277278
</Unit>
278279
</Units>
279280
<JumpHistory HistoryIndex="29">
280-
<Position>
281-
<Filename Value="umain.pas"/>
282-
<Caret Line="492" Column="39" TopLine="479"/>
283-
</Position>
284-
<Position>
285-
<Filename Value="umain.pas"/>
286-
<Caret Line="1531" Column="20" TopLine="1518"/>
287-
</Position>
288-
<Position>
289-
<Filename Value="umain.pas"/>
290-
<Caret Line="1545" Column="27" TopLine="1531"/>
291-
</Position>
292-
<Position>
293-
<Filename Value="umain.pas"/>
294-
<Caret Line="1603" Column="16" TopLine="1590"/>
295-
</Position>
296-
<Position>
297-
<Filename Value="umain.pas"/>
298-
<Caret Line="1621" Column="26" TopLine="1608"/>
299-
</Position>
300-
<Position>
301-
<Filename Value="umain.pas"/>
302-
<Caret Line="1713" Column="48" TopLine="1697"/>
303-
</Position>
304281
<Position>
305282
<Filename Value="umain.pas"/>
306283
<Caret Line="491" Column="34" TopLine="478"/>
@@ -397,6 +374,30 @@
397374
<Filename Value="uinfo.pas"/>
398375
<Caret Line="50" TopLine="36"/>
399376
</Position>
377+
<Position>
378+
<Filename Value="umain.pas"/>
379+
<Caret Line="1314" Column="40" TopLine="1302"/>
380+
</Position>
381+
<Position>
382+
<Filename Value="umain.pas"/>
383+
<Caret Line="1724" TopLine="1717"/>
384+
</Position>
385+
<Position>
386+
<Filename Value="umain.pas"/>
387+
<Caret Line="1085" TopLine="1079"/>
388+
</Position>
389+
<Position>
390+
<Filename Value="umain.pas"/>
391+
<Caret Line="753" Column="17" TopLine="746"/>
392+
</Position>
393+
<Position>
394+
<Filename Value="utypes.pas"/>
395+
<Caret Line="126" Column="18" TopLine="112"/>
396+
</Position>
397+
<Position>
398+
<Filename Value="umain.pas"/>
399+
<Caret Line="753" Column="17" TopLine="746"/>
400+
</Position>
400401
</JumpHistory>
401402
<RunParams>
402403
<FormatVersion Value="2"/>

src/flexpacket.res

0 Bytes
Binary file not shown.

src/umain.pas

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ procedure TFMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
653653
except
654654
end;
655655

656-
if MIEnableTNC.Checked and Assigned(Hostmode) then
656+
if FPConfig.EnableTNC and Assigned(Hostmode) then
657657
begin
658658
Hostmode.Terminate;
659659
Hostmode.WaitFor;
@@ -747,7 +747,7 @@ procedure TFMain.EnableKISSClick(Sender: TObject);
747747
begin
748748
FPConfig.EnableTNC := False;
749749
FPConfig.EnableAGW := False;
750-
FPCOnfig.EnableKISS := True;
750+
FPConfig.EnableKISS := True;
751751
SaveConfigToFile(@FPConfig);
752752
if MessageDlg('To apply the configuration, we have to restart FlexPacket.', mtConfirmation, [mbCancel, mbOk], 0) = mrOk then
753753
RestartApplication;
@@ -1080,6 +1080,10 @@ procedure TFMain.actFileUploadClick(Sender: TObject);
10801080
procedure TFMain.TBMapClick(Sender: TObject);
10811081
var run: TProcess;
10821082
begin
1083+
// Set Monitoring Mode
1084+
if MIEnableTNC.Checked or MIEnableKISS.Checked then
1085+
SendStringCommand(0,1,'M USIC');
1086+
10831087
actSetExternalMode.Checked := True;
10841088
ExternalMode := True;
10851089
miSetExternalMode.Checked := True;
@@ -1718,6 +1722,9 @@ procedure TFMain.actOpenConversExecute(Sender: TObject);
17181722

17191723
procedure TFMain.actSetExternalModeExecute(Sender: TObject);
17201724
begin
1725+
// Set Monitoring Mode
1726+
if MIEnableTNC.Checked or MIEnableKISS.Checked then
1727+
SendStringCommand(0,1,'M USIC');
17211728
if actSetExternalMode.Checked then
17221729
begin
17231730
actSetExternalMode.Checked := False;

0 commit comments

Comments
 (0)