Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
93730c58
Commit
93730c58
authored
Jan 15, 2014
by
-f
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:OpenEducationFoundation/OpenBoard into develop
parents
2ccecf20
4c9d9693
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
UBApplicationController.cpp
src/core/UBApplicationController.cpp
+4
-3
No files found.
src/core/UBApplicationController.cpp
View file @
93730c58
...
...
@@ -482,7 +482,7 @@ void UBApplicationController::showDesktop(bool dontSwitchFrontProcess)
void
UBApplicationController
::
checkUpdate
(
QString
urlString
)
{
if
(
mHttp
)
delete
mHttp
;
mHttp
->
deleteLater
()
;
QUrl
url
(
urlString
);
mHttp
=
new
QHttp
(
url
.
host
());
connect
(
mHttp
,
SIGNAL
(
requestFinished
(
int
,
bool
)),
this
,
SLOT
(
updateRequestFinished
(
int
,
bool
)));
...
...
@@ -503,14 +503,15 @@ void UBApplicationController::updateHeaderReceived(QHttpResponseHeader header)
void
UBApplicationController
::
updateRequestFinished
(
int
id
,
bool
error
)
{
if
(
error
){
qWarning
()
<<
"http command id"
<<
id
<<
"return the error: "
<<
mHttp
->
errorString
();
mHttp
->
close
();
qWarning
()
<<
"http command id"
<<
id
<<
"return an error"
;
}
else
{
QString
responseString
=
QString
(
mHttp
->
readAll
());
qDebug
()
<<
responseString
;
if
(
!
responseString
.
isEmpty
()
&&
responseString
.
contains
(
"version"
)
&&
responseString
.
contains
(
"url"
)){
mHttp
->
close
();
mHttp
->
deleteLater
();
mHttp
=
0
;
downloadJsonFinished
(
responseString
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment