From eda7428895aaba1c6007b50ff5091b3bd085f97c Mon Sep 17 00:00:00 2001
From: tonikelope <tonikelope@gmail.com>
Date: Fri, 14 Oct 2016 17:28:31 +0200
Subject: [PATCH] 1.32

- Bug fix
---
 src/megabasterd/SettingsDialog.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/megabasterd/SettingsDialog.java b/src/megabasterd/SettingsDialog.java
index 1bcd4dc96..ba2dfe129 100644
--- a/src/megabasterd/SettingsDialog.java
+++ b/src/megabasterd/SettingsDialog.java
@@ -1071,9 +1071,16 @@ public final class SettingsDialog extends javax.swing.JDialog {
                     swingReflectionInvokeAndWait("setLocationRelativeTo", dialog, tthis);
 
                     swingReflectionInvokeAndWait("setVisible", dialog, true);
+                    
+                    byte[] old_mega_master_pass = null;
 
-                    byte[] old_mega_master_pass = _main_panel.getMega_master_pass();
-
+                    if(_main_panel.getMega_master_pass() != null) {
+                    
+                        old_mega_master_pass = new byte[_main_panel.getMega_master_pass().length];
+                        
+                        System.arraycopy(_main_panel.getMega_master_pass(), 0, old_mega_master_pass, 0, _main_panel.getMega_master_pass().length);
+                    }
+                    
                     String old_mega_master_pass_hash = _main_panel.getMega_master_pass_hash();
 
                     if(dialog.isPass_ok()) {