fixed file saving with bad names, version 0.5.12 prepared

telegramdesktop · Jul 30, 2014 · c5182ab · c5182ab
1 parent a53e0e8
commit c5182ab
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 18 deletions.
diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.11
-AppVersion=5011
+AppVersionStr=0.5.12
+AppVersion=5012
 
 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"

diff --git a/Telegram/PrepareLinux32.sh b/Telegram/PrepareLinux32.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.11
-AppVersion=5011
+AppVersionStr=0.5.12
+AppVersion=5012
 
 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"

diff --git a/Telegram/PrepareMac.sh b/Telegram/PrepareMac.sh
@@ -1,5 +1,5 @@
-AppVersionStr=0.5.11
-AppVersion=5011
+AppVersionStr=0.5.12
+AppVersion=5012
 
 if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"

diff --git a/Telegram/Setup.iss b/Telegram/Setup.iss
@@ -3,9 +3,9 @@
 
 #define MyAppShortName "Telegram"
 #define MyAppName "Telegram Win (Unofficial)"
-#define MyAppVersion "0.5.11"
-#define MyAppVersionZero "0.5.11"
-#define MyAppFullVersion "0.5.11.0"
+#define MyAppVersion "0.5.12"
+#define MyAppVersionZero "0.5.12"
+#define MyAppFullVersion "0.5.12.0"
 #define MyAppPublisher "Telegram (Unofficial)"
 #define MyAppURL "https://tdesktop.com"
 #define MyAppExeName "Telegram.exe"

diff --git a/Telegram/SourceFiles/art/icons.png b/Telegram/SourceFiles/art/icons.png
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 */
 #pragma once
 
-static const int32 AppVersion = 5011;
-static const wchar_t *AppVersionStr = L"0.5.11";
+static const int32 AppVersion = 5012;
+static const wchar_t *AppVersionStr = L"0.5.12";
 #ifdef Q_OS_WIN
 static const wchar_t *AppName = L"Telegram Win (Unofficial)";
 #else

diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
@@ -227,6 +227,13 @@ void PhotoLink::onClick(Qt::MouseButton button) const {
 }
 
 QString saveFileName(const QString &title, const QString &filter, const QString &prefix, QString name, bool savingAs, const QDir &dir = QDir()) {
+#ifdef Q_OS_WIN
+	name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_"));
+#elif defined Q_OS_MAC
+	name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_"));
+#elif defined Q_OS_LINUX
+	name = name.replace(QRegularExpression(qsl("[\\/]")), qsl("_"));
+#endif
 	if (cAskDownloadPath() || savingAs) {
 		if (!name.isEmpty() && name.at(0) == QChar::fromLatin1('.')) {
 			name = filedialogDefaultName(prefix, name);

diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.11</string>
+	<string>0.5.12</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>NOTE</key>

diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1453,7 +1453,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.5.11;
+				CURRENT_PROJECT_VERSION = 0.5.12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1471,7 +1471,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.5.11;
+				CURRENT_PROJECT_VERSION = 0.5.12;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1495,9 +1495,9 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.5.11;
+				CURRENT_PROJECT_VERSION = 0.5.12;
 				DYLIB_COMPATIBILITY_VERSION = 0.5;
-				DYLIB_CURRENT_VERSION = 0.5.11;
+				DYLIB_CURRENT_VERSION = 0.5.12;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
@@ -1620,10 +1620,10 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.5.11;
+				CURRENT_PROJECT_VERSION = 0.5.12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.5;
-				DYLIB_CURRENT_VERSION = 0.5.11;
+				DYLIB_CURRENT_VERSION = 0.5.12;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;