Safer state machine for settings initialization

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Safer state machine for settings initialization
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
9488135e · Romain Goyet · Felix Paul Kühne · 13bf28e9 · 9488135e
Commit 9488135e authored Jun 16, 2013 by Romain Goyet Committed by Felix Paul Kühne Jun 17, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

AspenProject/VLCMenuViewController.m AspenProject/VLCMenuViewController.m +7 -4

No files found.
--- a/AspenProject/VLCMenuViewController.m
+++ b/AspenProject/VLCMenuViewController.m
@@ -144,11 +144,14 @@

 - (IBAction)showSettings:(id)sender
 {
-    if (!self.settingsViewController)
-        self.settingsViewController = [[IASKAppSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
-
-    if (!self.settingsController)
+    if (!self.settingsController) {
        self.settingsController = [[VLCSettingsController alloc] init];
+    }
+
+    if (!self.settingsViewController) {
+        self.settingsViewController = [[IASKAppSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
+        self.settingsController.viewController = self.settingsViewController;
+    }

    self.settingsViewController.modalPresentationStyle = UIModalPresentationFormSheet;
    self.settingsViewController.delegate = self.settingsController;