From 95131eba30ea5a0a02eb87d06cd7ed79800739fe Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Sun, 25 Sep 2016 18:34:31 +0200
Subject: [PATCH] PadSettings Clone Fixed
---
.../de/tobias/playpad/pad/PadSettings.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/PadSettings.java b/PlayWallCore/src/de/tobias/playpad/pad/PadSettings.java
index 4a20423b..1aad4870 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/PadSettings.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/PadSettings.java
@@ -211,8 +211,23 @@ public class PadSettings implements Cloneable {
PadSettings settings = (PadSettings) super.clone();
settings.volumeProperty = new SimpleDoubleProperty(getVolume());
settings.loopProperty = new SimpleBooleanProperty(isLoop());
- settings.timeModeProperty = new SimpleObjectProperty<TimeMode>(getTimeMode());
- settings.warningProperty = new SimpleObjectProperty<>(getWarning());
+
+ if (isCustomTimeMode())
+ settings.timeModeProperty = new SimpleObjectProperty<TimeMode>(getTimeMode());
+ else
+ settings.timeModeProperty = new SimpleObjectProperty<TimeMode>();
+
+ if (isCustomFade())
+ settings.fadeProperty = new SimpleObjectProperty<>(getFade());
+ else
+ settings.fadeProperty = new SimpleObjectProperty<>();
+
+ if (isCustomWarning())
+ settings.warningProperty = new SimpleObjectProperty<>(getWarning());
+ else
+ settings.warningProperty = new SimpleObjectProperty<>();
+
+ settings.customLayoutProperty = new SimpleBooleanProperty(isCustomWarning());
settings.layouts = new HashMap<>();
for (String key : layouts.keySet()) {
CartDesign clone = (CartDesign) layouts.get(key).clone();
--
GitLab