4 files changed, 7 insertions, 3 deletions
diff --git a/plugins/CloudFile/res/resource.rc b/plugins/CloudFile/res/resource.rc
index b071d664f7..e1c06d953e 100644
--- a/plugins/CloudFile/res/resource.rc
+++ b/plugins/CloudFile/res/resource.rc
@@ -93,10 +93,10 @@ BEGIN
     GROUPBOX        "General",IDC_STATIC,5,5,297,33
     COMBOBOX        IDC_DEFAULTSERVICE,102,17,194,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Default service",IDC_STATIC,11,19,85,8
-    GROUPBOX        "On conflict when upload",IDC_STATIC,5,41,297,56
+    CONTROL         "Do nothing",IDC_DONOTHINGONCONFLICT,"Button",BS_AUTORADIOBUTTON,11,54,51,10
     CONTROL         "Try to rename",IDC_RENAMEONCONFLICT,"Button",BS_AUTORADIOBUTTON,11,67,285,10
     CONTROL         "Try to replace",IDC_REPLACEONCONFLICT,"Button",BS_AUTORADIOBUTTON,11,80,285,10
-    CONTROL         "Nothing",IDC_DONOTHING,"Button",BS_AUTORADIOBUTTON,11,54,41,10
+    GROUPBOX        "On conflict when upload",IDC_STATIC,5,41,297,56
 END
 
 IDD_OAUTH DIALOGEX 0, 0, 193, 83
diff --git a/plugins/CloudFile/src/options.cpp b/plugins/CloudFile/src/options.cpp
index ca9a860962..11abf03c01 100644
--- a/plugins/CloudFile/src/options.cpp
+++ b/plugins/CloudFile/src/options.cpp
@@ -3,6 +3,7 @@
 COptionsMain::COptionsMain()
 	: CPluginDlgBase(hInstance, IDD_OPTIONS_MAIN, MODULE),
 	m_defaultService(this, IDC_DEFAULTSERVICE),
+	m_doNothingOnConflict(this, IDC_DONOTHINGONCONFLICT),
 	m_renameOnConflict(this, IDC_RENAMEONCONFLICT),
 	m_repalceOnConflict(this, IDC_REPLACEONCONFLICT),
 	m_urlAutoSend(this, IDC_URL_AUTOSEND),
@@ -41,6 +42,8 @@ void COptionsMain::OnInitDialog()
 		m_renameOnConflict.SetState(TRUE);
 	else if (strategy == OnConflict::REPLACE)
 		m_repalceOnConflict.SetState(TRUE);
+	else
+		m_doNothingOnConflict.SetState(TRUE);
 }
 
 void COptionsMain::OnApply()
diff --git a/plugins/CloudFile/src/options.h b/plugins/CloudFile/src/options.h
index a0fd102c7d..7b16de5db6 100644
--- a/plugins/CloudFile/src/options.h
+++ b/plugins/CloudFile/src/options.h
@@ -6,6 +6,7 @@ class COptionsMain : public CPluginDlgBase
 private:
 	CCtrlCombo m_defaultService;
 
+	CCtrlCheck m_doNothingOnConflict;
 	CCtrlCheck m_renameOnConflict;
 	CCtrlCheck m_repalceOnConflict;
 
diff --git a/plugins/CloudFile/src/resource.h b/plugins/CloudFile/src/resource.h
index 90d32f5162..384581fb4f 100644
--- a/plugins/CloudFile/src/resource.h
+++ b/plugins/CloudFile/src/resource.h
@@ -14,7 +14,7 @@
 #define IDC_OAUTH_AUTHORIZE             122
 #define IDD_OPTIONS_MAIN                1000
 #define IDC_DEFAULTSERVICE              1001
-#define IDC_DONOTHING                   1010
+#define IDC_DONOTHINGONCONFLICT         1010
 #define IDC_RENAMEONCONFLICT            1011
 #define IDC_REPLACEONCONFLICT           1012
 #define IDC_URL_ISTEMPORARY             1021