Changeset 1190

Timestamp:

02/27/2010 10:04:24 AM (2 years ago)

Author:

gbooker

Message:

Forgot to commit the updated version check code

Files:

• trunk/SapphireFrappliance/FRAppliance/SapphireAppliance.m (modified) (4 diffs)

trunk/SapphireFrappliance/FRAppliance/SapphireAppliance.m

@@ -66 +66 @@
 @end
 
-static NSString *initialError = nil;
+static NSString *initialMessage = nil;
+static NSString *initialMessageType = nil;
 
 @implementation SapphireAppliance
@@ -78 +79 @@
         SapphireLoadFramework(frameworkPath);
         if(!loadCMPFramework(myBundlePath))
-                initialError = BRLocalizedString(@"Error loading common player framework.  Continuing is not recomended", @"Error string for loading common player framework");
-        else if([CMPPlayerManager version] != CMPVersion)
-                initialError = BRLocalizedString(@"Common player framework is newer than expected.  You may wish to check if a newer version of Sapphire is available.  You may attempt to continue if you like.", @"Warning string for common player framework being newer than Sapphire");
+        {
+                initialMessage = BRLocalizedString(@"Error loading common player framework.  Continuing is not recomended", @"Error string for loading common player framework");
+                initialMessageType = BRLocalizedString(@"Error", @"Error");
+                
+        }
+        else if([CMPPlayerManager apiVersion] != CMPAPIVersion)
+        {
+                initialMessage = BRLocalizedString(@"Common player framework is newer than expected.  You may wish to check if a newer version of Sapphire is available.  You may attempt to continue if you like.", @"Warning string for common player framework being newer than Sapphire");
+                initialMessageType = BRLocalizedString(@"Warning", @"Warning");
+        }
         Class cls = NSClassFromString( @"BRFeatureManager" );
         if ( cls == Nil )
@@ -168 +176 @@
 - (id) applianceControllerWithScene: (id) scene
 {
-        if(initialError && !usingCategories)
-        {
-                BRAlertController *controller = [SapphireFrontRowCompat alertOfType:0 titled:@"Error" primaryText:@"Framework Error" secondaryText:initialError withScene:nil];
-                initialError = nil;
+        if(initialMessage && !usingCategories)
+        {
+                BRAlertController *controller = [SapphireFrontRowCompat alertOfType:0 titled:initialMessageType primaryText:@"Framework Issue" secondaryText:initialMessage withScene:nil];
+                initialMessage = nil;
+                initialMessageType = nil;
                 return controller;
         }
@@ -248 +257 @@
 -(id)controllerForIdentifier:(id)ident
 {
-        if(initialError)
-        {
-                BRAlertController *controller = [SapphireFrontRowCompat alertOfType:0 titled:@"Error" primaryText:@"Framework Error" secondaryText:initialError withScene:nil];
-                initialError = nil;
+        if(initialMessage)
+        {
+                BRAlertController *controller = [SapphireFrontRowCompat alertOfType:0 titled:initialMessageType primaryText:@"Framework Issue" secondaryText:initialMessage withScene:nil];
+                initialMessage = nil;
+                initialMessageType = nil;
                 return controller;
         }