From f560ce747b3f4b44fe4c862de021b76398af7011 Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Sat, 27 Dec 2014 02:20:55 +0100 Subject: [PATCH] Fix order depedency --- AVRsack/ASPreferences.swift | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/AVRsack/ASPreferences.swift b/AVRsack/ASPreferences.swift index c24cc8b..1dc3b16 100644 --- a/AVRsack/ASPreferences.swift +++ b/AVRsack/ASPreferences.swift @@ -13,9 +13,12 @@ private let kASToolchainArduino = 1 private let kASToolchainOther = 2 class ASPreferences: NSWindowController, NSOpenSavePanelDelegate { - dynamic var toolchainPref : String = "" { - didSet(oldPref) { - NSUserDefaults.standardUserDefaults().setObject(toolchainPref, forKey: "Toolchain") + var toolchainPref : String { + get { + return NSUserDefaults.standardUserDefaults().objectForKey("Toolchain") as String + } + set(newToolchain) { + NSUserDefaults.standardUserDefaults().setObject(newToolchain, forKey: "Toolchain") } } var toolchainType : Int { @@ -63,11 +66,6 @@ class ASPreferences: NSWindowController, NSOpenSavePanelDelegate { self.init(windowNibName:"ASPreferences") } - override func awakeFromNib() { - super.awakeFromNib() - toolchainPref = NSUserDefaults.standardUserDefaults().objectForKey("Toolchain") as String - } - var hasCrossPackAVR : Bool { get { return NSFileManager.defaultManager().fileExistsAtPath("/usr/local/CrossPack-AVR/bin")