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

Merge branch 'net5' of github.com:goatcorp/Dalamud into net5

Browse source
This commit is contained in:
goat 2022-07-25 00:28:13 +02:00
commit 00839640b3
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Configuration/Internal/DalamudConfiguration.cs
View file

@ -332,6 +332,11 @@ namespace Dalamud.Configuration.Internal
/// </summary> /// </summary>
public bool ShowDevBarInfo { get; set; } = true; public bool ShowDevBarInfo { get; set; } = true;
/// <summary>
/// Gets or sets the last-used contact details for the plugin feedback form.
/// </summary>
public string LastFeedbackContactDetails { get; set; } = string.Empty;
/// <summary> /// <summary>
/// Load a configuration from the provided path. /// Load a configuration from the provided path.
/// </summary> /// </summary>

7
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -666,6 +666,11 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
Log.Error("FeedbackPlugin was null."); Log.Error("FeedbackPlugin was null.");
} }
if (!string.IsNullOrWhiteSpace(this.feedbackModalContact))
{
Service<DalamudConfiguration>.Get().LastFeedbackContactDetails = this.feedbackModalContact;
}
ImGui.CloseCurrentPopup(); ImGui.CloseCurrentPopup();
} }
} }
@ -681,7 +686,7 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
if (!this.feedbackModalOnNextFrameDontClear) if (!this.feedbackModalOnNextFrameDontClear)
{ {
this.feedbackModalBody = string.Empty; this.feedbackModalBody = string.Empty;
this.feedbackModalContact = string.Empty; this.feedbackModalContact = Service<DalamudConfiguration>.Get().LastFeedbackContactDetails;
this.feedbackModalIncludeException = false; this.feedbackModalIncludeException = false;
this.feedbackIsAnonymous = false; this.feedbackIsAnonymous = false;
} }