LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse source 
Conflicts:
	src/main/main.js
This commit is contained in:
Igor Gassmann 2017-12-08 14:37:06 -03:00
commit 9a786f7d48
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/main.js
View file

@ -135,6 +135,8 @@ function createWindow () {
? new BrowserWindow({backgroundColor: '#155B4A', minWidth: 800, minHeight: 600, webPreferences: {webSecurity: false}}) ? new BrowserWindow({backgroundColor: '#155B4A', minWidth: 800, minHeight: 600, webPreferences: {webSecurity: false}})
: new BrowserWindow({backgroundColor: '#155B4A', minWidth: 800, minHeight: 600}); : new BrowserWindow({backgroundColor: '#155B4A', minWidth: 800, minHeight: 600});
win.webContents.session.setUserAgent(`LBRY/${localVersion}`);
win.maximize() win.maximize()
if (isDevelopment) { if (isDevelopment) {
win.webContents.openDevTools(); win.webContents.openDevTools();

8
src/renderer/redux/actions/content.js
View file

@ -280,13 +280,17 @@ export function doLoadVideo(uri) {
dispatch(doDownloadFile(uri, streamInfo)); dispatch(doDownloadFile(uri, streamInfo));
} }
}) })
.catch(error => { .catch(() => {
dispatch(doSetPlayingUri(null)); dispatch(doSetPlayingUri(null));
dispatch({ dispatch({
type: types.LOADING_VIDEO_FAILED, type: types.LOADING_VIDEO_FAILED,
data: { uri }, data: { uri },
}); });
dispatch(doAlertError(error)); dispatch(
doAlertError(
`Failed to download ${uri}, please try again. If this problem persists, visit https://lbry.io/faq/support for support.`
)
);
}); });
}; };
} }