From 23e1638bd8a0e743f168937cb7443816b17251ed Mon Sep 17 00:00:00 2001
From: "moneromooo.monero" <moneromooo.monero@users.noreply.github.com>
Date: Fri, 18 Nov 2016 19:38:26 +0000
Subject: [PATCH] Receive: fix null dereference

---
 pages/Receive.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/Receive.qml b/pages/Receive.qml
index 6e658900..b4730293 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -42,7 +42,7 @@ Rectangle {
     property alias integratedAddressText : integratedAddressLine.text
 
     function updatePaymentId(payment_id) {
-        if (typeof appWindow.currentWallet === 'undefined')
+        if (typeof appWindow.currentWallet === 'undefined' || appWindow.currentWallet == null)
             return
         // generate a new one if not given as argument
         if (typeof payment_id === 'undefined') {