X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FFileManager.java;h=766677f813fb545db54e03ed95dace71ff4e4e3f;hb=522c0536b53194d2bb61f76bc65fe9d143057f4e;hp=b919bb627c4d27a58a34e4f75fb2604b10845797;hpb=954a1a33392ef83e007b1045e2aaeac173361289;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/gui/FileManager.java b/src/net/pterodactylus/jsite/gui/FileManager.java
index b919bb6..766677f 100644
--- a/src/net/pterodactylus/jsite/gui/FileManager.java
+++ b/src/net/pterodactylus/jsite/gui/FileManager.java
@@ -399,7 +399,11 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
 						fileOverride = new FileOverride();
 						project.addFileOverride(projectFile, fileOverride);
 					}
-					fileOverride.setContentType(MimeTypes.getMimeType(getFileExtension(projectFile.getName())));
+					String projectFileName = projectFile.getName();
+					String mimeType = MimeTypes.getMimeType(getFileExtension(projectFileName));
+					fileOverride.setContentType(mimeType);
+					fillComboBox(projectFileName);
+					contentTypeOverrideComboBox.setSelectedItem(mimeType);
 				} else {
 					fileOverride.setContentType(null);
 					if (fileOverride.isEmpty()) {
@@ -408,6 +412,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
 				}
 			}
 		};
+		overrideContentTypeDefaultAction.setEnabled(false);
 		contentTypeOverrideAction = new AbstractAction() {
 
 			/**
@@ -845,7 +850,7 @@ public class FileManager extends JDialog implements I18nable, TreeSelectionListe
 		boolean overrideInsertSelected = false;
 		boolean insertOverrideEnabled = false;
 		boolean insertOverrideSelected = false;
-		String defaultContentType = MimeTypes.DEFAULT_CONTENT_TYPE;
+		String defaultContentType = "";
 		boolean overrideContentTypeEnabled = false;
 		boolean overrideContentTypeSelected = false;
 		boolean contentTypeOverrideEnabled = false;