diff --git a/FFmpegSource/ffmpegsource.h b/FFmpegSource/ffmpegsource.h
index 8c6a26200..10a9f3653 100644
--- a/FFmpegSource/ffmpegsource.h
+++ b/FFmpegSource/ffmpegsource.h
@@ -21,7 +21,9 @@
 #ifndef FFMPEGSOURCE_H
 #define FFMPEGSOURCE_H
 
+#ifndef NO_FLAC_CACHE
 #define FLAC_CACHE
+#endif
 
 #include <windows.h>
 #include <stdio.h>
diff --git a/aegisub/visual_tool_vector_clip.cpp b/aegisub/visual_tool_vector_clip.cpp
index cb79f7b65..36359fa2f 100644
--- a/aegisub/visual_tool_vector_clip.cpp
+++ b/aegisub/visual_tool_vector_clip.cpp
@@ -457,7 +457,7 @@ void VisualToolVectorClip::CommitHold() {
 	if (mode != 3 && mode != 4) SetOverride(_T("\\clip"),_T("(") + spline.EncodeToASS() + _T(")"));
 
 	// End freedraw
-	if (mode == 6 || mode == 7) SetMode(0);
+	if (!holding && (mode == 6 || mode == 7)) SetMode(0);
 }