From fe3a86611793f7f199133561a954f15caf9a390d Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Fri, 30 Aug 2019 19:00:37 +0100
Subject: [PATCH] Bug 2077 - Residual: Original code was correct for Windows

If new code is used on windows, we get an assert.
---
 src/export/ExportFFmpegDialogs.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp
index 5158c494a..077d7b05b 100644
--- a/src/export/ExportFFmpegDialogs.cpp
+++ b/src/export/ExportFFmpegDialogs.cpp
@@ -468,7 +468,15 @@ void ExportFFmpegCustomOptions::OnOpen(wxCommandEvent & WXUNUSED(evt))
       }
    }
    DropFFmpegLibs();
+
+#ifdef __WXMAC__
+   // Bug 2077 Must be a parent window on OSX or we will appear behind.
    auto pWin = wxGetTopLevelParent( this );
+#else
+   // Use GetTopWindow on windows as there is no hWnd with top level parent.
+   auto pWin = wxTheApp->GetTopWindow();
+#endif
+
    ExportFFmpegOptions od(pWin);
    od.ShowModal();
 }