From b239ac5ddefd80da9084ce233cda85da01f83b97 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 18 Sep 2019 11:40:36 +0800
Subject: [PATCH] https://www.trustie.net/issues/24251

---
 public/react/src/modules/comment/CommentInput.js      | 2 +-
 public/react/src/modules/page/MainContentContainer.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/comment/CommentInput.js b/public/react/src/modules/comment/CommentInput.js
index 18708332b..e627caa1a 100644
--- a/public/react/src/modules/comment/CommentInput.js
+++ b/public/react/src/modules/comment/CommentInput.js
@@ -68,7 +68,7 @@ class CommentInput extends Component {
                             </textarea>
                         </div>
                         <div className="tips"
-                            style={{ 'float': 'left', 'margin-top': '6px', 'font-size': '12px', 'color': '#ff6800'}}>
+                            style={{ 'float': 'left', 'marginTop': '6px', 'fontSize': '12px', 'color': '#ff6800'}}>
                             请勿粘贴答案，否则将造成账号禁用等后果！
                         </div>
                         <div className="fr buttons" style={{ minWidth:'25px', height: '32px' }}>
diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js
index 50eacdd4b..e217fa386 100644
--- a/public/react/src/modules/page/MainContentContainer.js
+++ b/public/react/src/modules/page/MainContentContainer.js
@@ -530,7 +530,7 @@ class MainContentContainer extends Component {
 		let codeContent = this.state.repositoryCode;
 		if (window['editor_CodeMirror']) {
 			codeContent = window.editor_CodeMirror.getValue();
-		} else if (window.editor_monaco) {
+		} else if (window.editor_monaco && window.editor_monaco.getModel()) { // (编程切选择题) 如果dispose了，model为空
 			codeContent = window.editor_monaco.getValue()
 		}
 		if (checkIfCodeChanged === true && this.oldRepositoryCode == codeContent) {