Skip to content

Commit a2354d2

Browse files
committed
fix admin window not opening
1 parent 6a65903 commit a2354d2

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

Intersect.Client.Core/Core/Input.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,10 @@ public static void OnKeyPressed(Keys modifier, Keys key)
325325
break;
326326

327327
case Control.OpenAdminPanel:
328-
PacketSender.SendOpenAdminWindow();
328+
if (Interface.Interface.GameUi.ToggleAdminWindow())
329+
{
330+
PacketSender.SendOpenAdminWindow();
331+
}
329332
break;
330333

331334
case Control.OpenGuild:

Intersect.Client.Core/Interface/Game/Admin/AdminWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ private void MapSortCheckboxOnCheckChanged(ICheckbox sender, ValueChangedEventAr
521521

522522
private void UpdateMapList()
523523
{
524-
_mapTree?.Dispose();
524+
_mapTree?.DelayedDelete();
525525

526526
_mapTree = new TreeControl(_mapListPanel, nameof(_mapTree))
527527
{

Intersect.Client.Core/Interface/Game/GameInterface.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,10 @@ public void NotifyOpenAdminWindow()
176176
mShouldOpenAdminWindow = true;
177177
}
178178

179-
public void OpenAdminWindow()
179+
public bool ToggleAdminWindow()
180180
{
181+
mShouldOpenAdminWindow = false;
182+
181183
if (mAdminWindow == null)
182184
{
183185
mAdminWindow ??= new AdminWindow(GameCanvas);
@@ -193,7 +195,7 @@ public void OpenAdminWindow()
193195
mAdminWindow.Show();
194196
}
195197

196-
mShouldOpenAdminWindow = false;
198+
return mAdminWindow.IsVisibleInParent;
197199
}
198200

199201
//Shop
@@ -378,7 +380,7 @@ public void Update(TimeSpan elapsed, TimeSpan total)
378380
//Admin window update
379381
if (mShouldOpenAdminWindow)
380382
{
381-
OpenAdminWindow();
383+
ToggleAdminWindow();
382384
}
383385

384386
//Shop Update

0 commit comments

Comments
 (0)