From c03dc995569cdae437d0f46893dedd6ff1a8914d Mon Sep 17 00:00:00 2001
From: cebix <>
Date: Thu, 13 Jul 2000 17:45:33 +0000
Subject: [PATCH] - Picasso 96 is given preference over CyberGfx because of
 P96's CyberGfx   emulation

---
 BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp | 14 +++++++-------
 BasiliskII/src/AmigaOS/video_amiga.cpp        |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp b/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp
index e2eb854e..87033205 100644
--- a/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp
+++ b/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp
@@ -1248,19 +1248,19 @@ static void screen_mode_req(struct Window *win, struct LayoutHandle *h)
 
 	ULONG id;
 
-	if (CyberGfxBase) {
+	if (P96Base) {
+		id = p96RequestModeIDTags(
+			P96MA_MinDepth, 8,
+			P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8,
+			TAG_END
+		);
+	} else {
 		UWORD model_array[] = {PIXFMT_LUT8, PIXFMT_RGB16, PIXFMT_ARGB32, 0, ~0};
 		id = (ULONG) CModeRequestTags(NULL,
 			CYBRMREQ_MinDepth, 8,
 			CYBRMREQ_CModelArray, (ULONG)model_array,
 			TAG_END
 		);
-	} else {
-		id = p96RequestModeIDTags(
-			P96MA_MinDepth, 8,
-			P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8,
-			TAG_END
-		);
 	}
 	LT_UnlockWindow(win);
 
diff --git a/BasiliskII/src/AmigaOS/video_amiga.cpp b/BasiliskII/src/AmigaOS/video_amiga.cpp
index 5ae35caf..0335cfb8 100644
--- a/BasiliskII/src/AmigaOS/video_amiga.cpp
+++ b/BasiliskII/src/AmigaOS/video_amiga.cpp
@@ -193,10 +193,10 @@ static bool init_screen(ULONG mode_id)
 	ADBSetRelMouseMode(true);
 
 	// Check whether the mode is a Picasso96 mode or a CyberGfx mode
-	if (CyberGfxBase && IsCyberModeID(mode_id))
-		is_cgfx = true;
-	else if (P96Base && p96GetModeIDAttr(mode_id, P96IDA_ISP96))
+	if (P96Base && p96GetModeIDAttr(mode_id, P96IDA_ISP96))
 		is_p96 = true;
+	else if (CyberGfxBase && IsCyberModeID(mode_id))
+		is_cgfx = true;
 	else {
 		ErrorAlert(GetString(STR_NO_P96_MODE_ERR));
 		return false;