From e6d93a21dad72ea3943e75e5924f0d7209a60d32 Mon Sep 17 00:00:00 2001
From: alcexhim <alcexhim@gmail.com>
Date: Sun, 20 Apr 2014 12:15:00 -0400
Subject: [PATCH] Added null check and fixed DataFormatReference initialization

---
 .../Subtitle/SubStationAlpha/SubStationAlphaDataFormat.cs     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CSharp/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Subtitle/SubStationAlpha/SubStationAlphaDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Subtitle/SubStationAlpha/SubStationAlphaDataFormat.cs
index 0af89bb3..136ebaa3 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Subtitle/SubStationAlpha/SubStationAlphaDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Subtitle/SubStationAlpha/SubStationAlphaDataFormat.cs
@@ -24,7 +24,7 @@ namespace UniversalEditor.DataFormats.Multimedia.Subtitle.SubStationAlpha
         {
             if (_dfr == null)
             {
-                _dfr = base.MakeReference();
+                _dfr = new DataFormatReference(GetType());
                 _dfr.Capabilities.Add(typeof(SubtitleObjectModel), DataFormatCapabilities.All);
                 _dfr.Filters.Add("SubStation Alpha subtitles", new string[] { "*.ssa", "*.ass" });
                 _dfr.ExportOptions.Add(new CustomOptionText("Title", "&Title:"));
@@ -44,6 +44,8 @@ namespace UniversalEditor.DataFormats.Multimedia.Subtitle.SubStationAlpha
         protected override void BeforeSaveInternal(Stack<ObjectModel> objectModels)
         {
             SubtitleObjectModel subtitle = (objectModels.Pop() as SubtitleObjectModel);
+            if (subtitle == null) throw new ObjectModelNotSupportedException();
+
             PropertyListObjectModel plom = new PropertyListObjectModel();
 
             Group grpScriptInfo = plom.Groups.Add("Script Info");