Fix macOS ShowModalAsync.

VPKSoft · Jul 14, 2022 · ef44f93 · ef44f93
1 parent 6b0a9c2
commit ef44f93
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/amp.EtoForms/FormMain.Layout.cs b/amp.EtoForms/FormMain.Layout.cs
@@ -29,6 +29,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using amp.Database.DataModel;
 using amp.EtoForms.Forms;
 using amp.EtoForms.Properties;
+using amp.Shared.Classes;
 using amp.Shared.Localization;
 using Eto.Drawing;
 using Eto.Forms;
@@ -385,7 +386,19 @@ private void CreateMenu()
 
     private async void ManageAlbumsCommand_Executed(object? sender, EventArgs e)
     {
-        if (await new FormAlbums(context).ShowModalAsync(this))
+        bool modalResult;
+
+        if (UtilityOS.IsMacOS)
+        {
+            // ReSharper disable once MethodHasAsyncOverload, Shown-event won't fire on macOS.
+            modalResult = new FormAlbums(context).ShowModal(this);
+        }
+        else
+        {
+            modalResult = await new FormAlbums(context).ShowModalAsync(this);
+        }
+
+        if (modalResult)
         {
             await UpdateAlbumDataSource();
         }