From a0867fa7c575db316ddc0d7fcce1504b151a2140 Mon Sep 17 00:00:00 2001 From: Chris Soh Date: Thu, 21 Aug 2014 14:43:35 +0800 Subject: [PATCH] Changing the Logical Or to Bitwise Or to change from Either to Either Or Both values --- atom/browser/native_window.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 94d308b355..d3fed61454 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -145,7 +145,7 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) { Center(); } int min_height = 0, min_width = 0; - if (options.Get(switches::kMinHeight, &min_height) || + if (options.Get(switches::kMinHeight, &min_height) | options.Get(switches::kMinWidth, &min_width)) { SetMinimumSize(gfx::Size(min_width, min_height)); }