github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9962 from ferreus/dev/vladimir_fix_8768

Browse Source 
Fix #8768: Show() on already open modal
This commit is contained in:
Cheng Zhao
2017-07-17 10:49:18 +03:00
committed by GitHub
parent fb519274e0 06b5acdac0
commit a43553aa25
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
atom/browser/native_window_views.cc
View File

@@ -374,7 +374,8 @@ bool NativeWindowViews::IsFocused() {
}
void NativeWindowViews::Show() {
if (is_modal() && NativeWindow::parent())
if (is_modal() && NativeWindow::parent() &&
!window_->native_widget_private()->IsVisible())
static_cast<NativeWindowViews*>(NativeWindow::parent())->SetEnabled(false);
window_->native_widget_private()->ShowWithWindowState(GetRestoredState());