Merge pull request #513 from performant-software/dev

FairCopy v.1.1.7
performant-software · Feb 15, 2023 · 248de64 · 248de64
2 parents c632b0a + f3a14f1
commit 248de64
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "faircopy",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "A word processor for the humanities scholar.",
   "main": "public/electron.js",
   "private": true,

diff --git a/public/main-process/release-notes/latest.md b/public/main-process/release-notes/latest.md
@@ -2,6 +2,13 @@
 
 The release notes list the improvements and bug fixes included in each new version of the software.
 
+## Version 1.1.7
+
+### Bug Fixes
+
+* Crash bug deleting resource with no parent
+* Error message when checking out config
+
 ## Version 1.1.6
 
 ### Improvements

diff --git a/src/components/App.js b/src/components/App.js
@@ -62,6 +62,8 @@ export default class App extends Component {
     if( lockStatus !== 'checked_out' ) {
       fairCopyProject.saveFairCopyConfig( config, configLastAction )
       this.setState( { ...this.state } )
+    } else {
+      fairCopyProject.configLastAction = configLastAction
     }
   }
 

diff --git a/src/components/main-window/dialogs/AlertDialog.js b/src/components/main-window/dialogs/AlertDialog.js
@@ -77,7 +77,7 @@ export default class AlertDialog extends Component {
 
             // we need to see if any of the open resources have a doomed resource as a parent and add them to close list
             for( const openResource of Object.values(openResources) ) {
-                if( resourceIDs.includes( openResource.parentEntry.id ) ) {
+                if( openResource.parentEntry && resourceIDs.includes( openResource.parentEntry.id ) ) {
                     closingResourceIDs.push( openResource.resourceID )
                 }
             }