cellMsgDialogAbort: don't call on_close and properly re-enable pads

RPCS3 · Jun 1, 2019 · f501dc6 · f501dc6
1 parent cafa452
commit f501dc6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
@@ -389,7 +389,7 @@ error_code cellMsgDialogAbort()
 	{
 		if (auto dlg = manager->get<rsx::overlays::message_dialog>())
 		{
-			dlg->close();
+			dlg->close(false);
 			return CELL_OK;
 		}
 	}
@@ -406,7 +406,9 @@ error_code cellMsgDialogAbort()
 		return CELL_SYSUTIL_ERROR_BUSY;
 	}
 
-	verify(HERE), fxm::remove<MsgDialogBase>();
+	verify(HERE), fxm::remove<MsgDialogBase>(); // this shouldn't call on_close
+	pad::SetIntercepted(false);                 // so we need to reenable the pads here
+
 	return CELL_OK;
 }
 

diff --git a/rpcs3/Emu/RSX/Overlays/overlays.cpp b/rpcs3/Emu/RSX/Overlays/overlays.cpp
@@ -305,7 +305,7 @@ namespace rsx
 			return 0;
 		}
 
-		void user_interface::close()
+		void user_interface::close(bool use_callback)
 		{
 			// Force unload
 			exit = true;
@@ -322,7 +322,7 @@ namespace rsx
 
 			pad::SetIntercepted(false);
 
-			if (on_close)
+			if (on_close && use_callback)
 				on_close(return_code);
 		}
 

diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h
@@ -89,7 +89,7 @@ namespace rsx
 				close();
 			}
 
-			void close();
+			void close(bool use_callback = true);
 
 			s32 run_input_loop();
 		};