ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-22 16:39:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #106 from Caraxi/master

Browse source 
Avoid crashing when clicking Choose with no item selected
This commit is contained in:
goaaats 2020-05-03 16:34:54 +02:00 • committed by GitHub
commit 009a4901f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dalamud/Interface/ItemSearchWindow.cs
View file

@ -186,14 +186,22 @@ namespace Dalamud.Interface
ImGui.EndChild(); ImGui.EndChild();
if (ImGui.Button(Loc.Localize("Choose", "Choose"))) { // Darken choose button if it shouldn't be clickable
OnItemChosen?.Invoke(this, this.searchTask.Result[this.selectedItemIndex]); ImGui.PushStyleVar(ImGuiStyleVar.Alpha, this.selectedItemIndex < 0 ? 0.25f : 1);
if (ImGui.Button(Loc.Localize("Choose", "Choose"))) {
try {
OnItemChosen?.Invoke(this, this.searchTask.Result[this.selectedItemIndex]);
if (this.closeOnChoose) { if (this.closeOnChoose) {
this.selectedItemTex?.Dispose(); this.selectedItemTex?.Dispose();
isOpen = false; isOpen = false;
} }
} catch (Exception ex) {
Log.Error($"Exception in Choose: {ex.Message}");
} }
}
ImGui.PopStyleVar();
if (!this.closeOnChoose) { if (!this.closeOnChoose) {
ImGui.SameLine(); ImGui.SameLine();