From 482b7427f06d34c22d3bd1fe1807251030120f30 Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Fri, 24 Apr 2020 19:46:23 +0200
Subject: [PATCH] ui: get rid of 100% notif message. avoid logging garbage when
 canceled

---
 core/hw/naomi/naomi_cart.cpp | 4 +++-
 core/imgread/common.h        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/hw/naomi/naomi_cart.cpp b/core/hw/naomi/naomi_cart.cpp
index b39aadbba..5e27bf70f 100644
--- a/core/hw/naomi/naomi_cart.cpp
+++ b/core/hw/naomi/naomi_cart.cpp
@@ -87,7 +87,7 @@ static bool naomi_LoadBios(const char *filename, Archive *child_archive, Archive
 			region = bios->blobs[romid].region;
 		else
 		{
-			if (bios->blobs[romid].region != region)
+			if (bios->blobs[romid].region != (u32)region)
 				continue;
 		}
 		found_region = true;
@@ -369,6 +369,8 @@ static void naomi_cart_LoadZip(const char *filename)
 		naomi_rotate_screen = game->rotation_flag == ROT270;
 
 		CurrentCartridge->Init();
+		if (loading_canceled)
+			return;
 
 		strcpy(naomi_game_id, CurrentCartridge->GetGameId().c_str());
 		if (naomi_game_id[0] == '\0')
diff --git a/core/imgread/common.h b/core/imgread/common.h
index 473901b71..f2afdf7cc 100644
--- a/core/imgread/common.h
+++ b/core/imgread/common.h
@@ -174,7 +174,7 @@ struct Disc
 		u32 progress = ~0;
 		for (u32 i = 1; i <= count; i++)
 		{
-			if (count >= 100)
+			if (count >= 1000)
 			{
 				if (loading_canceled)
 					break;