From 81945c399590c1bd2c6837bdae0091f6b649b3a1 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 6 Jun 2010 10:08:25 +0000
Subject: - URecord.ValidateSettings should not display the popup itself -
 Array free version of CheckPlayersConfig

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2450 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/base/UMain.pas | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/base/UMain.pas')

diff --git a/src/base/UMain.pas b/src/base/UMain.pas
index 0d479420..1d924d56 100644
--- a/src/base/UMain.pas
+++ b/src/base/UMain.pas
@@ -98,6 +98,7 @@ uses
 procedure Main;
 var
   WindowTitle: string;
+  BadPlayer: integer;
 begin
   {$IFNDEF Debug}
   try
@@ -304,8 +305,14 @@ begin
     SoundLib.StartBgMusic;
 
     // check microphone settings, goto record options if they are corrupt
-    if (not AudioInputProcessor.ValidateSettings) then
+    BadPlayer := AudioInputProcessor.ValidateSettings;
+    if (BadPlayer <> 0) then
+    begin
+      ScreenPopupError.ShowPopup(
+          Format(Language.Translate('ERROR_PLAYER_DEVICE_ASSIGNMENT'),
+          [BadPlayer]));
       Display.CurrentScreen^.FadeTo( @ScreenOptionsRecord );
+    end;
 
     //------------------------------
     // Start Mainloop
-- 
cgit v1.2.3