From e2ac00d2d933c7079148b7b673910a7f13a5ec49 Mon Sep 17 00:00:00 2001
From: eisler <eisler@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sun, 18 Jun 2017 08:48:07 +0000
Subject: [PATCH] bugfix: MQTT: undef patch

git-svn-id: https://svn.fhem.de/fhem/trunk@14534 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED         |  5 +++--
 fhem/FHEM/00_MQTT.pm | 11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index ec15535f6..70cea2d3a 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,9 +1,10 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - bugfix:  MQTT: undef patch
   - bugfix:  ESPEasy: added missing event command (Forum #73291)
   - bugfix:  YAMAHA_AVR: use DSP-based commands for RX-V2065
-  - bugfix: 10_MQTT_DEVICE.pm: publishSet patch (Forum #msg648963)
-  - feature: 10_MQTT_DEVICE.pm: publishSet patch (Forum #msg648596)
+  - bugfix:  MQTT_DEVICE: publishSet patch (Forum #msg648963)
+  - feature: MQTT_DEVICE: publishSet patch (Forum #msg648596)
   - feature: 01_FHEMWEB.pm: selectnumbers widget modifier (Forum #73188)
   - feature: 98_structure.pm: add evaluateSetResult attribute (Forum #73113)
   - feature: ESPEasy: improved defineFn if bridge port is missing, docu update
diff --git a/fhem/FHEM/00_MQTT.pm b/fhem/FHEM/00_MQTT.pm
index 1cdaeed6d..e92a66497 100644
--- a/fhem/FHEM/00_MQTT.pm
+++ b/fhem/FHEM/00_MQTT.pm
@@ -52,6 +52,7 @@ sub MQTT_Initialize($) {
   # Consumer
   $hash->{DefFn}    = "MQTT::Define";
   $hash->{UndefFn}  = "MQTT::Undef";
+  $hash->{DeleteFn} = "MQTT::Delete";
   $hash->{SetFn}    = "MQTT::Set";
   $hash->{NotifyFn} = "MQTT::Notify";
 
@@ -118,10 +119,14 @@ sub Define($$) {
   }
 }
 
-sub Undef($) {
-  my $hash = shift;
+sub Undef($$) {
+  my ($hash, $name) = @_;
   Stop($hash);
-  my $name = $hash->{NAME};
+  return undef;
+}
+
+sub Delete($$) {
+  my ($hash, $name) = @_;
   setKeyValue($name."_user",undef);
   setKeyValue($name."_pass",undef);
   return undef;