From 7331b790217f9a3e86e5668cb134bd8f073ff289 Mon Sep 17 00:00:00 2001 From: Alexandre LittleWhite Laurent Date: Sat, 23 Jul 2016 19:37:12 +0200 Subject: Protection against a resize of size 0 --- src/common/emu_window.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/common') diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp index 08270dd88..fd728c109 100644 --- a/src/common/emu_window.cpp +++ b/src/common/emu_window.cpp @@ -51,7 +51,6 @@ static bool IsWithinTouchscreen(const EmuWindow::FramebufferLayout& layout, unsi } std::tuple EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) { - new_x = std::max(new_x, framebuffer_layout.bottom_screen.left); new_x = std::min(new_x, framebuffer_layout.bottom_screen.right-1); @@ -92,9 +91,9 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { } EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(unsigned width, unsigned height) { - - ASSERT(width > 0); - ASSERT(height > 0); + // When hiding the widget, the function receives a size of 0 + if (width == 0) width = 1; + if (height == 0) height = 1; EmuWindow::FramebufferLayout res = { width, height, {}, {} }; -- cgit v1.2.3