From 0afe80b1eaacca72de659d3508b11e3776a12a88 Mon Sep 17 00:00:00 2001
From: JericX <ddjiangruochen@hotmail.com>
Date: Fri, 19 May 2017 11:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84nullException?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SyncClipboard/Properties/Settings.Designer.cs | 4 ++--
 SyncClipboard/Properties/Settings.settings    | 4 ++--
 SyncClipboard/SyncService.cs                  | 2 +-
 SyncClipboard/app.config                      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/SyncClipboard/Properties/Settings.Designer.cs b/SyncClipboard/Properties/Settings.Designer.cs
index 3deecc77..656ec1ba 100644
--- a/SyncClipboard/Properties/Settings.Designer.cs
+++ b/SyncClipboard/Properties/Settings.Designer.cs
@@ -38,7 +38,7 @@ public string URL {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("a")]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
         public string USERNAME {
             get {
                 return ((string)(this["USERNAME"]));
@@ -50,7 +50,7 @@ public string USERNAME {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("b")]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
         public string PASSWORD {
             get {
                 return ((string)(this["PASSWORD"]));
diff --git a/SyncClipboard/Properties/Settings.settings b/SyncClipboard/Properties/Settings.settings
index 7506c6bb..0c7dd978 100644
--- a/SyncClipboard/Properties/Settings.settings
+++ b/SyncClipboard/Properties/Settings.settings
@@ -6,10 +6,10 @@
       <Value Profile="(Default)">https://cloud.jericx.xyz/remote.php/dav/files/JericX/Clipboard/SyncClipboard.json</Value>
     </Setting>
     <Setting Name="USERNAME" Type="System.String" Scope="User">
-      <Value Profile="(Default)">a</Value>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="PASSWORD" Type="System.String" Scope="User">
-      <Value Profile="(Default)">b</Value>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="IFPULL" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
diff --git a/SyncClipboard/SyncService.cs b/SyncClipboard/SyncService.cs
index a4e587a4..2aba3dcc 100644
--- a/SyncClipboard/SyncService.cs
+++ b/SyncClipboard/SyncService.cs
@@ -107,7 +107,7 @@ private void PullFromRemote()
             {
                 return;
             }
-            if (p1.Clipboard != this.oldString)
+            if (p1 != null && p1.Clipboard != this.oldString)
             {
                 if (this.isFirstTime)
                 {
diff --git a/SyncClipboard/app.config b/SyncClipboard/app.config
index 66d96b93..49bba11f 100644
--- a/SyncClipboard/app.config
+++ b/SyncClipboard/app.config
@@ -11,10 +11,10 @@
                 <value>https://cloud.jericx.xyz/remote.php/dav/files/JericX/Clipboard/SyncClipboard.json</value>
             </setting>
             <setting name="USERNAME" serializeAs="String">
-                <value>a</value>
+                <value />
             </setting>
             <setting name="PASSWORD" serializeAs="String">
-                <value>b</value>
+                <value />
             </setting>
             <setting name="IFPULL" serializeAs="String">
                 <value>True</value>