# HG changeset patch # User Alexander Simon # Date 1495807798 -10800 # Fri May 26 17:09:58 2017 +0300 # Branch release82 # Node ID a49b4303e5818391cb11ea3706304d11864720f7 # Parent 3cf17deffa980fe001ef4aadf53ac50f7100008e fixed Bug #270748 C/C++ editor destroys groovy editor diff --git a/cnd.editor/src/org/netbeans/modules/cnd/editor/options/CodeStylePreferencesProvider.java b/cnd.editor/src/org/netbeans/modules/cnd/editor/options/CodeStylePreferencesProvider.java --- a/cnd.editor/src/org/netbeans/modules/cnd/editor/options/CodeStylePreferencesProvider.java +++ b/cnd.editor/src/org/netbeans/modules/cnd/editor/options/CodeStylePreferencesProvider.java @@ -72,8 +72,13 @@ public static final CodeStylePreferences.Provider INSTANCE = new CodeStylePreferences.Provider() { @Override public Preferences forFile(FileObject file, String mimeType) { + // forFile can be called with (null, null) by infrastructure + if (mimeType == null) { + mimeType = file == null ? null : MIMESupport.getSourceFileMIMEType(file); + } if (mimeType == null) { - mimeType = MIMESupport.getSourceFileMIMEType(file); + // not accepted + return null; } if (MIMENames.C_MIME_TYPE.equals(mimeType)) { return NbPreferences.forModule(CodeStyle.class);