From e84d7c0cdabe376208b7c9903b1306fa0f7125d0 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 26 Feb 2018 14:47:36 -0800
Subject: [PATCH] add warning when addTabbedWindow is called on self

---
 atom/browser/native_window_mac.mm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 72dd45728f..30cc66d6f2 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -1672,8 +1672,12 @@ void NativeWindowMac::ToggleTabBar() {
 }
 
 void NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
-  if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)]) {
-    [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
+  if (window_.get() == window->GetNativeWindow()) {
+    NSLog(@"Error: AddTabbedWindow cannot be called by a window on itself.");
+  } else {
+    if ([window_ respondsToSelector:@selector(addTabbedWindow:ordered:)]) {
+      [window_ addTabbedWindow:window->GetNativeWindow() ordered:NSWindowAbove];
+    }
   }
 }