2016-02-23 23:30:24 +00:00
|
|
|
From: =?utf-8?q?Carl_F=C3=BCrstenberg?= <azatoth@gmail.com>
|
|
|
|
|
Date: Tue, 6 Jan 2015 23:12:30 +0100
|
|
|
|
|
Subject: Use common license
|
|
|
|
|
|
|
|
|
|
use common license at /usr/share/common-licenses instead of the shipped
|
|
|
|
|
copy
|
|
|
|
|
---
|
2019-09-22 21:29:12 +00:00
|
|
|
UI/window-basic-about.cpp | 7 +------
|
|
|
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
2016-02-23 23:30:24 +00:00
|
|
|
|
2019-09-22 21:29:12 +00:00
|
|
|
diff --git a/UI/window-basic-about.cpp b/UI/window-basic-about.cpp
|
2020-03-25 20:27:47 +00:00
|
|
|
index 98f893c..d1b2f82 100644
|
2019-07-27 13:07:36 +00:00
|
|
|
--- a/UI/window-basic-about.cpp
|
|
|
|
|
+++ b/UI/window-basic-about.cpp
|
2019-09-22 21:29:12 +00:00
|
|
|
@@ -150,15 +150,10 @@ void OBSAbout::ShowAuthors()
|
2019-07-27 13:07:36 +00:00
|
|
|
|
|
|
|
|
void OBSAbout::ShowLicense()
|
2016-02-23 23:30:24 +00:00
|
|
|
{
|
2019-07-27 13:07:36 +00:00
|
|
|
- std::string path;
|
|
|
|
|
+ std::string path("/usr/share/common-licenses/GPL-2");
|
|
|
|
|
QString error = "Error! File could not be read.\n\n \
|
|
|
|
|
Go to: https://github.com/obsproject/obs-studio/blob/master/COPYING";
|
2016-02-23 23:30:24 +00:00
|
|
|
|
2019-07-27 13:07:36 +00:00
|
|
|
- if (!GetDataFilePath("license/gplv2.txt", path)) {
|
|
|
|
|
- ui->textBrowser->setPlainText(error);
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
BPtr<char> text = os_quick_read_utf8_file(path.c_str());
|
2016-02-23 23:30:24 +00:00
|
|
|
|
2019-07-27 13:07:36 +00:00
|
|
|
if (!text || !*text) {
|
