Skip to content

Commit 171fda2

Browse files
committed
Merge remote-tracking branch 'remotes/origin/dominique/movie-recorder'
2 parents 797f5ea + 7ea4dba commit 171fda2

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

source/FrameRecorder/Core/Editor/RecorderEditor.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ protected virtual void OnEnable()
4040

4141
var pf = new PropertyFinder<RecorderSettings>(serializedObject);
4242
m_Inputs = pf.Find(x => x.m_SourceSettings);
43-
m_ShowInputEditor = new bool[m_Inputs.arraySize];
44-
for (int i = 0; i < m_ShowInputEditor.Length; ++i)
45-
m_ShowInputEditor[i] = true;
4643
m_Verbose = pf.Find(x => x.m_Verbose);
4744
m_FrameRateMode = pf.Find(x => x.m_FrameRateMode);
4845
m_FrameRate = pf.Find(x => x.m_FrameRate);
@@ -130,6 +127,14 @@ protected void PrepareInitialSources()
130127
{
131128
AddSourceSettings(newSetting);
132129
}
130+
}
131+
132+
if (m_ShowInputEditor == null || m_ShowInputEditor.Length != m_Inputs.arraySize)
133+
{
134+
var oldLength = m_ShowInputEditor == null ? 0 : m_ShowInputEditor.Length;
135+
m_ShowInputEditor = new bool[m_Inputs.arraySize];
136+
for (int i = oldLength; i < m_ShowInputEditor.Length; ++i)
137+
m_ShowInputEditor[i] = true;
133138
}
134139
}
135140

source/FrameRecorder/Core/Editor/RecorderWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void OnGUI()
115115
if (m_State == EState.Recording)
116116
try
117117
{
118-
Debug.LogError("Aborting recording due to an exception!");
118+
Debug.LogError("Aborting recording due to an exception!\n" + ex.ToString());
119119
StopRecording();
120120
}
121121
catch (Exception)

0 commit comments

Comments
 (0)