From f12a20f85eebd90e737f3dd5b8c2c046186955f9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 8 May 2015 16:32:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index ebb7c2fc8..69d8bc3a6 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -122,7 +122,7 @@ class MyController < ApplicationController
 
         if @user.save && @se.save
           # 头像保存
-          FileUtils.mv diskfile1, diskfile, force: true
+          FileUtils.mv diskfile1, diskfile, force: true if File.exist? diskfile1
           @user.pref.save
           @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
           set_language_if_valid @user.language