From fb0007d1c0e4f103c9f26d6534e40637e78eb861 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Sun, 23 Mar 2014 21:50:33 +0100
Subject: [PATCH] fixed #165 Password generator is reseted if opened as single
 window not via generate button on entry

---
 MacPass/MPAppDelegate.m                   | 2 +-
 MacPass/MPPasswordCreatorViewController.h | 7 +++++++
 MacPass/MPPasswordCreatorViewController.m | 9 +++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index bfb45aee..2c335159 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -192,7 +192,7 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
     NSView *creatorView = [_passwordCreatorController view];
     [self.passwordCreatorWindow setContentView:creatorView];
   }
-  
+  [self.passwordCreatorController reset];
   [self.passwordCreatorWindow makeKeyAndOrderFront:self.passwordCreatorWindow];
 }
 
diff --git a/MacPass/MPPasswordCreatorViewController.h b/MacPass/MPPasswordCreatorViewController.h
index a8576c98..f6c95433 100644
--- a/MacPass/MPPasswordCreatorViewController.h
+++ b/MacPass/MPPasswordCreatorViewController.h
@@ -12,4 +12,11 @@
 
 @property (copy, readonly) NSString *generatedPassword;
 
+/**
+ *  Should be called to reset the generator
+ *
+ *  @param sender sender of the action
+ */
+- (void)reset;
+
 @end
diff --git a/MacPass/MPPasswordCreatorViewController.m b/MacPass/MPPasswordCreatorViewController.m
index af5cb939..aee4640c 100644
--- a/MacPass/MPPasswordCreatorViewController.m
+++ b/MacPass/MPPasswordCreatorViewController.m
@@ -108,13 +108,18 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
   [self.symbolsButton setTag:MPPasswordCharactersSymbols];
   
   [self _resetCharacters];
-  [self _generatePassword:nil];
+  [self _generatePassword:self];
+}
+
+- (void)reset {
+  [self _resetCharacters];
+  [self _generatePassword:self];
 }
 
 #pragma mark -
 #pragma mark Actions
 
-- (IBAction)_generatePassword:(id)sender { 
+- (IBAction)_generatePassword:(id)sender {
   if(_useCustomString) {
     if([[_customCharactersTextField stringValue] length] > 0) {
       self.password = [[_customCharactersTextField stringValue] passwordWithLength:_passwordLength];