mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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
commit a43553aa25
1 changed files with 2 additions and 1 deletions
Show stats 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());