From 03956df17f7f2efc3474c3ca29ea64475e5348b2 Mon Sep 17 00:00:00 2001
From: Nicolas Bacca
Date: Sun, 9 May 2004 14:48:59 +0000
Subject: Add warning for unresolved conflicts

svn-id: r13823
---
 backends/wince/CELauncherDialog.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'backends')

diff --git a/backends/wince/CELauncherDialog.cpp b/backends/wince/CELauncherDialog.cpp
index 2aff8319cf..4947fe2bd1 100644
--- a/backends/wince/CELauncherDialog.cpp
+++ b/backends/wince/CELauncherDialog.cpp
@@ -56,6 +56,20 @@ public:
 	}
 };
 
+class CEConflictDialog : public Dialog {
+public:
+	CEConflictDialog::CEConflictDialog(const Common::String &name)
+	: Dialog(10, 60, 300, 77) {
+	
+		addButton((_w - kButtonWidth) / 2, 45, "OK", kCloseCmd, '\r');	// Close dialog - FIXME
+
+		Common::String conflict("Too many matches for directory ");
+		conflict += name;
+		new StaticTextWidget(this, 0, 10, _w, kLineHeight, conflict, kTextAlignCenter);
+		new StaticTextWidget(this, 0, 20, _w, kLineHeight, "Please fix this :)", kTextAlignCenter);
+	}
+};
+
 
 CELauncherDialog::CELauncherDialog(GameDetector &detector) : GUI::LauncherDialog(detector) {
 }
@@ -87,8 +101,12 @@ void CELauncherDialog::addCandidate(String &path, DetectedGameList &candidates)
 				if (scumm_stricmp(candidateName, candidates[i].name) == 0) {
 					idx = i;
 					break;
+				}
+			}	
+			if (idx == -1) {
+				CEConflictDialog conflict(candidateName);
+				conflict.runModal();
 			}
-		}		
 	}
 
 	if (idx < 0)
-- 
cgit v1.2.3