Merge remote-tracking branch 'origin/master'

konradrenner · Mar 22, 2016 · 47925df · 47925df
2 parents 1168c59 + 984606c
commit 47925df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -27,6 +27,8 @@ Already implemented features (help is highly desired!):
  * Local notes thanks to a local account
  * Tablet interface
  * Support for Richtext and inline images
+ * Import/Export of notebooks
+ * Printing of notes
 
 Translations (help is highly desired!):
  * English

diff --git a/app/src/main/java/org/kore/kolabnotes/android/fragment/DetailFragment.java b/app/src/main/java/org/kore/kolabnotes/android/fragment/DetailFragment.java
@@ -287,7 +287,7 @@ public void onClick(View v) {
         setNotebook(activeAccount, notebook, startNotebook != null);
         intialNotebookName = getNotebookSpinnerSelectionName();
 
-        if (savedInstanceState != null) {
+        if (savedInstanceState != null && savedInstanceState.getString(EDITOR) != null) {
             /* Restoring saved data into editor */
             String descriptionValue = initImageMap(savedInstanceState.getString(EDITOR));
             setHtml(descriptionValue);