From 3dbd735acdce36c5462c18280de320117d9e4b2f Mon Sep 17 00:00:00 2001
From: APTX <marek321@gmail.com>
Date: Sun, 26 Dec 2010 04:28:04 +0100
Subject: [PATCH] Fix crash on opening file in a folder with files not
 recognized by DirectoryPlaylist.

---
 src/directoryplaylist.cpp | 3 ++-
 src/src.pro               | 9 ++++++---
 src/videowindow.cpp       | 3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/directoryplaylist.cpp b/src/directoryplaylist.cpp
index 0839d6a..2bed72f 100644
--- a/src/directoryplaylist.cpp
+++ b/src/directoryplaylist.cpp
@@ -26,7 +26,7 @@ void DirectoryPlaylist::setDirectory(QDir directory)
 
 	updateEntrylist();
 
-	m_currentIndex = 0;
+	m_currentIndex = count() ? 0 : -1;
 }
 
 int DirectoryPlaylist::indexOfFile(const QString &file) const
@@ -109,6 +109,7 @@ void DirectoryPlaylist::updateEntrylist()
 				<< "*.ogm"
 				<< "*.wmv"
 				<< "*.avi"
+				<< "*.mpg"
 				<< "*.flv",
 			QDir::Files | QDir::Readable,
 			QDir::Name);
diff --git a/src/src.pro b/src/src.pro
index 847b080..3e6f160 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -24,7 +24,8 @@ SOURCES += main.cpp \
     episodevotedialog.cpp \
     versiondialog.cpp \
     seekslider.cpp \
-    videoplayer.cpp
+	videoplayer.cpp \
+    anidbconfigdialog.cpp
 HEADERS += menu.h \
     videowindow.h \
     videowidget.h \
@@ -36,10 +37,12 @@ HEADERS += menu.h \
     versiondialog.h \
     constants.h \
     seekslider.h \
-    videoplayer.h
+	videoplayer.h \
+    anidbconfigdialog.h
 FORMS += menu.ui \
     anidbconfigdialog.ui \
-    episodevotedialog.ui
+    episodevotedialog.ui \
+    anidbconfigdialog.ui
 win32:RC_FILE += aniplayer.rc
 browserplugin { 
     # CONFIG += qaxserver
diff --git a/src/videowindow.cpp b/src/videowindow.cpp
index 8c5d7a7..473cb8c 100644
--- a/src/videowindow.cpp
+++ b/src/videowindow.cpp
@@ -227,7 +227,7 @@ bool VideoWindow::open(bool closeOnStop)
 			this,
 			tr("Open media"),
 			dir,
-			tr("Video files (*.mkv *.mp4 *.ogg *.ogm *.wmv *.avi *.flv);;All files (*)")
+			tr("Video files (*.mkv *.mp4 *.ogg *.ogm *.wmv *.avi *.mpg *.flv);;All files (*)")
 		);
 
 	if (file == "")
@@ -547,7 +547,6 @@ void VideoWindow::markWatched()
 
 void VideoWindow::markingStatus(AniDBUdpClient::File::Action action, AniDBUdpClient::File::ActionState actionState, int percent)
 {
-	qDebug() << "markingStatus called";
 	AniDBUdpClient::File *file = (AniDBUdpClient::File *) sender();
 	switch (action)
 	{
-- 
2.52.0