tMerge pull request #471 from Zomnut/master - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 7684c0543b24d0a5eef388a2dbd08f982b0979ad
   DIR parent 6e54d2206ce6ce0d8dab8485eab6c21ac7d232c8
  HTML Author: ThomasV <thomasv1@gmx.de>
       Date:   Fri, 29 Nov 2013 08:41:25 -0800
       
       Merge pull request #471 from Zomnut/master
       
       Fix for resetting options to default on program start when in portable mode
       Diffstat:
         M lib/simple_config.py                |       3 +--
       
       1 file changed, 1 insertion(+), 2 deletions(-)
       ---
   DIR diff --git a/lib/simple_config.py b/lib/simple_config.py
       t@@ -30,8 +30,7 @@ a SimpleConfig instance then reads the wallet file.
        
                # user conf, writeable
                self.user_config = {}
       -        if options.get('portable') == False:
       -            self.read_user_config()
       +        self.read_user_config()