处理服务器文件不存在引起的nullException

Jeric-X · May 19, 2017 · 0afe80b · 0afe80b
1 parent edc4ea3
commit 0afe80b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/SyncClipboard/Properties/Settings.Designer.cs b/SyncClipboard/Properties/Settings.Designer.cs
diff --git 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
@@ -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
@@ -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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,7 +107,7 @@ private void PullFromRemote() @@
                 {
                     return;
                 }
-                if (p1.Clipboard != this.oldString)
+                if (p1 != null && p1.Clipboard != this.oldString)
                 {
                     if (this.isFirstTime)
                     {
@@ Expand Down @@