From c450a5468cd24104eaedf43541b784a0322cf5c7 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Wed, 1 Feb 2006 21:53:44 +0000 Subject: [PATCH] Fixed regression bug with drag&drop bugfix. Fixed strange nonsense in changelog. Originally committed to SVN as r55. --- core/changelog.txt | 2 +- core/frame_main.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/changelog.txt b/core/changelog.txt index 7370f57e0..87f426455 100644 --- a/core/changelog.txt +++ b/core/changelog.txt @@ -18,7 +18,7 @@ Please visit http://aegisub.net to download latest version - Fixed bug where \t tags (among others?) would lose their parameters when being rebuilt (happens with Framerate Transport export filter, Automation and during the karaoke timing improvements listed above, among other places) (jfs) - Implemented FexTracker, for automatically tracking positions on the video and placing text accordingly (Tentacle) - Drag-and-drop files onto the program no longer causes the subs to be unloaded every time, even if no subs were dropped (jfs) -- Recombining lines (1,1+2 and 1+2,2) where the lone line is a substring of the line only appearing combined no longer causes incorrect results (as a side-effect, more strict prefix/suffix-checking has also been implemented) (jfs) +- 1,1+2 recombining lines where 1 is a substring of 2 no longer causes incorrect behavior. 1+2,2 similarly fixed. This fix also gives more sanity-checking in the recombining (jfs) = 1.09 beta - 2006.01.16 =========================== diff --git a/core/frame_main.cpp b/core/frame_main.cpp index 13725be34..f6ea02b18 100644 --- a/core/frame_main.cpp +++ b/core/frame_main.cpp @@ -103,6 +103,7 @@ FrameMain::FrameMain (wxArrayString args) InitContents(); // Parse arguments + LoadSubtitles(_T("")); LoadList(args); // Set autosave timer