Merge branch 'java7'

rjolly · Dec 1, 2020 · 6d468d7 · 6d468d7
2 parents 051b99e + 3f6a1d8
commit 6d468d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/linoleum/Desktop.java b/src/main/java/linoleum/Desktop.java
@@ -83,6 +83,7 @@ public OpenAction() {
 
 		@Override
 		public void actionPerformed(final ActionEvent e) {
+			desktopPane.setRecording(false);
 			apps.select();
 			contentsAction.setEnabled(true);
 		}
@@ -127,6 +128,7 @@ public FullScreenAction() {
 
 		@Override
 		public void actionPerformed(final ActionEvent e) {
+			desktopPane.setRecording(false);
 			fullScreen();
 		}
 	}

diff --git a/src/main/java/linoleum/DesktopPane.java b/src/main/java/linoleum/DesktopPane.java
@@ -189,11 +189,11 @@ public boolean isReopen() {
 		return reopen;
 	}
 
-	private void setRecording(final boolean recording) {
+	void setRecording(final boolean recording) {
 		putClientProperty("DesktopPane.recording", this.recording = recording);
 	}
 
-	public boolean isRecording() {
+	boolean isRecording() {
 		return recording;
 	}
 

diff --git a/src/main/resources/META-INF/mime.types b/src/main/resources/META-INF/mime.types
@@ -4,7 +4,7 @@ application/xhtml+xml xhtml
 application/java-archive jar
 application/javascript js
 application/mvr mvr
-application/zip zip epub jmod
+application/zip zip epub jmod nbm apk
 audio/basic au snd
 audio/midi midi mid
 audio/mpeg mp3 mp2 mpa